| commit | 0062f811c0727e329bf96a75876a99e661419d0f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 15 08:05:37 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 15 08:05:37 2012 -0700 |
| tree | d52083a7227e09b898f6007767ef44658dd22352 | |
| parent | d3ee366af2ce12093478c35b14a1160599b27f71 [diff] | |
| parent | 1a0f6725392279ed6b44e97b00315b8173abf454 [diff] |
am 1a0f6725: (-s ours) Reconcile with jb-release - do not merge * commit '1a0f6725392279ed6b44e97b00315b8173abf454': JRO03P