diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-03-11 12:41:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-11 12:41:47 -0700 |
| commit | 72c7cf9d13f5a51a71dccc6d94317727bd0feec3 (patch) | |
| tree | 26878ce2fbb731f6cdd47a55ff1cfae54e9e58ee | |
| parent | f0ff908da019a44115109f1b4d1b6864b35a8a29 (diff) | |
| parent | a1b1e2de67ed5ed3dfa8c8e9554bb0f0ab18a71c (diff) | |
| download | frameworks_av-72c7cf9d13f5a51a71dccc6d94317727bd0feec3.zip frameworks_av-72c7cf9d13f5a51a71dccc6d94317727bd0feec3.tar.gz frameworks_av-72c7cf9d13f5a51a71dccc6d94317727bd0feec3.tar.bz2 | |
am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'a1b1e2de67ed5ed3dfa8c8e9554bb0f0ab18a71c':
0 files changed, 0 insertions, 0 deletions