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