commit | 7c1c45e449aea9141bd8cebb88c5fba08c704623 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 10 15:19:19 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 10 15:19:19 2012 -0800 |
tree | 02126b024db44cfe4b82cc38fbf63d83adfccddf | |
parent | bae4324402ec0acc594a16af225f23dd76b28400 [diff] | |
parent | a6485a73ca08f2e60d0ec01509e73db9262735b7 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I15433e982bbaa80391db117f5f1abd40469c70a6