| commit | 19fcef1cbd8a416400eff4c51a76646343d04e1e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Mar 05 15:58:56 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 15:58:56 2013 +0000 |
| tree | 7e34f746f14bd29fd2f0e6e5d4b99926e2f624b7 | |
| parent | 0dbeffe7b6130257e1dfd3ca37a3785553600c85 [diff] | |
| parent | a0d99936ff7ca85b59e0228eefc0fab79b7dbe0f [diff] |
am a0d99936: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'a0d99936ff7ca85b59e0228eefc0fab79b7dbe0f':