diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2013-03-11 12:28:33 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-11 12:28:33 -0700 |
commit | eb69ddd4db1f1a421f1d27e1d42d557f0897f08e (patch) | |
tree | 3ed5f81bb962df0a6295dfc59801180be0ee5732 | |
parent | f08c4c89622ddcbc4ed9315fe6b399941dad4939 (diff) | |
parent | c2e35f33ae6a31d4420672ad4dad46ca297c0db7 (diff) | |
download | telephony-jb-mr1.1-dev.tar.gz |
am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not mergejb-mr1.1-dev
* commit 'c2e35f33ae6a31d4420672ad4dad46ca297c0db7':
0 files changed, 0 insertions, 0 deletions