| commit | f8a0f51d264a2cebf6f3429df4439a2971f7da7a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:24:50 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 09:24:50 2012 -0700 |
| tree | 74f25fe97f8b088baeb209568355d5bf5c909198 | |
| parent | 049dd5ce0703d79a0ba78b2dc7945a74b6d9cc99 [diff] | |
| parent | a2b8a756dba78e9c6e86717da0610e2826587ead [diff] |
am a2b8a756: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'a2b8a756dba78e9c6e86717da0610e2826587ead':