| commit | 976a70c41ec0dd6f283c1bec8b2c0c15deb373c0 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 09 13:09:05 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 09 13:09:05 2012 -0800 |
| tree | 52610baba474df56aca468336f7da3b89a91b645 | |
| parent | 0f4d268311249113eeaf937dbe51ad2d94c7063f [diff] | |
| parent | 5194366bcdb91d5908c8db50f002a891fe8b8bde [diff] |
am 5194366b: Reconcile with jb-mr1-release - do not merge * commit '5194366bcdb91d5908c8db50f002a891fe8b8bde': JOP40