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