| commit | f289cf0457559cbc14ff511f58ee454c33b64076 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Apr 02 07:54:52 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 02 07:54:52 2013 -0700 |
| tree | 33e98ac517ee16f4ec66c4a05fb7abf249a3cc52 | |
| parent | fbde5ec436b28bdcd467a584f1d97d50b11ca5d9 [diff] | |
| parent | 3645145898b9abc49a0b8296aeb46299dfc72e56 [diff] |
am 36451458: Reconcile with jb-mr2-release - do not merge * commit '3645145898b9abc49a0b8296aeb46299dfc72e56':