commit | 65312005a889ad73f2e55af2b6948b30503a1aa6 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 15:40:59 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 15:40:59 2012 -0800 |
tree | 4c731c21027ce9550bfeb90cd84fd07eb7023da8 | |
parent | d337f56d2ccbd42904b24783e370f6c346f0b48c [diff] | |
parent | 66111e8ee366cc5401fceaf4053edf3ea5e4888b [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: Icc27f64f8cd9934afd61a543a1398f4ad9e2fc4a