commit | 34d12aaf7ab9162fe891458d45a130e93e9cbc34 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 13:26:37 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 13:26:37 2012 -0800 |
tree | 1dee373b08a4d64d93822a10adb2befdab9b1bd8 | |
parent | 25e3f42871569d5801082825b48c60330d9b60e0 [diff] | |
parent | d67bdb4b10463bda6c7fd2459759c9a870d4e329 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I2c8f0cf7f655c624f2c72ed967dba6b071e8fe6e