commit | 14a26131c7f33d6dd11cdaed798ed06dd730143f | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 09 07:35:36 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 09 07:35:36 2012 -0700 |
tree | a101ee740b52c613ca1e9d7857a42d2d54a4032f | |
parent | 4bbe7f69f42a5cc421c80df759faf86219653ea7 [diff] | |
parent | f1e72279ffbff47ef404e8f7d8c9bd7306f8382d [diff] |
am f1e72279: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f1e72279ffbff47ef404e8f7d8c9bd7306f8382d':