| commit | a412dec5bbfe2af7c6d5ee2d9bee840e976daeee | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 14:53:26 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 31 14:53:26 2012 -0700 |
| tree | d5a35a61a9c2f80d349ecd835b70e002b6aa2d20 | |
| parent | 5fe385add4690b2bce553c593f96baf468593630 [diff] | |
| parent | 768ebe51f4490cd8a84a42b13f84ba5e6a366d11 [diff] |
am 768ebe51: (-s ours) am 2a5f755a: am 8665eb73: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge * commit '768ebe51f4490cd8a84a42b13f84ba5e6a366d11': JZO31 JRO03N JRO03M