commit | 9cb91beb705bc468028da0cd04471f5f3783d031 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 19 13:58:48 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 19 13:58:48 2012 -0800 |
tree | 571f958e0953894c88befb54d0e1a40545510e37 | |
parent | 4ec98335bab7a94bd583ac57da2711eb8abc0f14 [diff] | |
parent | e551d6b45e3264dc1c5567c7a037309ca21ca4e6 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I4df1ba6a619529d9f5b96e8b7ed8bc470a81e2ad