diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-03-11 13:13:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-11 13:13:33 -0700 |
| commit | e53461a8db44e66023b87a4b4f249e9fa4689366 (patch) | |
| tree | 38e7a79da20cf168bc915745e26ce95f226627e3 | |
| parent | 9f662b7d0561a46a0250702385084c48efe9ca24 (diff) | |
| parent | 129a87f9bde4bff575607ebb3ce330161200aec3 (diff) | |
| download | android_frameworks_ex-e53461a8db44e66023b87a4b4f249e9fa4689366.tar.gz android_frameworks_ex-e53461a8db44e66023b87a4b4f249e9fa4689366.tar.bz2 android_frameworks_ex-e53461a8db44e66023b87a4b4f249e9fa4689366.zip | |
am 129a87f9: am 6b0409db: (-s ours) am 92be9d34: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '129a87f9bde4bff575607ebb3ce330161200aec3':
0 files changed, 0 insertions, 0 deletions