| commit | 73f954e8c735ece75411a81f1967c1839e466c6f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 02 07:30:27 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 02 07:30:27 2012 -0700 |
| tree | cbf49090bb4b54022a993af711e614a85c445c62 | |
| parent | 269019581b7bdd73f4c4e618a3a5bbc541058e72 [diff] | |
| parent | 7a37c4810898d461f59d2db417ecbd82298bd13d [diff] |
am 8b6ce0a2: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '8b6ce0a269ba67995766980f5b83937302143e64':