commit | faee53c0880c637acd9bf23b4a7aadeeb4a50085 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 28 09:47:55 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 28 09:47:55 2012 -0800 |
tree | 798b92b648c5609515b05a0e13076664c6fe2e4d | |
parent | 2cff609e0f0f0cfeab542d554596c35822d7dd45 [diff] | |
parent | 3448b04e289ddab218f9cfe0ea62d094b2ab4538 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: Ifaf3eb3035bc9be846a9edd3e64cbf3bf6f95f64