| commit | b2a7de12dfc0d623ca45199c7362c68070fb21eb | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:22:46 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:22:46 2012 -0800 |
| tree | e6e4939d89a60fb561f0c8bbaed0eeb662d17cef | |
| parent | 42dcf49fc9f344d2b813a9df69feb7107d55b7cd [diff] | |
| parent | 688b235bfbad9fcd60fbc44ef4bb2c23bb94e241 [diff] |
am 688b235b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '688b235bfbad9fcd60fbc44ef4bb2c23bb94e241':