| commit | eb724ddbe92ba4c090fafad42ca65af4fd8d5143 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri May 17 12:59:40 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 17 12:59:40 2013 -0700 |
| tree | 0275f0fb4a55afce2f03843de445ff45d9643721 | |
| parent | de4e579c68e74fa0c85b376769e9428cd822add7 [diff] | |
| parent | 7f78bd5e2517b6a2f6eceb5f1703e51aca236dc0 [diff] |
am 7f78bd5e: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '7f78bd5e2517b6a2f6eceb5f1703e51aca236dc0':