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