| commit | c47bf3ab3d0afb28d4631c898217bf8db37d0b7c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 03 11:36:47 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 03 11:36:47 2012 -0800 |
| tree | ecda00d7701fc24e070044d0cc46858eb91a884e | |
| parent | 0d54bc21d49ed11304e891fb079bcaf61b6bd4c6 [diff] | |
| parent | 713fb9fd596c9c0e3c2021f7b1f69bec12a1e93d [diff] |
am 713fb9fd: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '713fb9fd596c9c0e3c2021f7b1f69bec12a1e93d':