commit | 31bd5a89ce0e764e7df361ac2306312bbfa22155 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Aug 10 08:53:29 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 10 08:53:29 2012 -0700 |
tree | d8ea7c4afcc18c6a06d90221a8d3bbe4e7e9df57 | |
parent | 5a519c55dd84ab11a23c51fdc6c543a2cadb20e0 [diff] | |
parent | 8e1a87533521ac5918855256dbb92727eda1c953 [diff] |
am 8e1a8753: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '8e1a87533521ac5918855256dbb92727eda1c953': JOO40B JOO40 JOO39B