| commit | c644b14501d0f399923580f59e6c449548fb9d05 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 08 08:18:49 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 08 08:18:49 2012 -0700 |
| tree | 9907e7f794f0d96ae2a43894a9efab73a695c104 | |
| parent | 284f7fb9ecc9361c43e0b6da24872732f655dc0c [diff] | |
| parent | 9f2ef2fbf5cb26089828ea1b588253bd20ddefa5 [diff] |
am 9f2ef2fb: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '9f2ef2fbf5cb26089828ea1b588253bd20ddefa5':