| commit | 2c76626789453bb9734ced4b5aab318260bff795 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 09 22:41:18 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 09 22:41:18 2012 -0800 |
| tree | 66560b1b15c06e1db31f93160bc2f052bdbe172d | |
| parent | fc76f0eb17c606eb6df639d7a6c2f4ef2f3e09f1 [diff] | |
| parent | 976a70c41ec0dd6f283c1bec8b2c0c15deb373c0 [diff] |
am 976a70c4: am 5194366b: Reconcile with jb-mr1-release - do not merge * commit '976a70c41ec0dd6f283c1bec8b2c0c15deb373c0': JOP40