commit | fa384c7f751ba9320c65ce9a62fbe3007bca3315 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Aug 03 13:56:03 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Aug 03 13:56:03 2012 -0700 |
tree | a1c2d75ba2ad3f2fa032e6923bce9ca1c02eee61 | |
parent | b78b24e1bf8a1195fd038c874561db80ea2214c5 [diff] | |
parent | 4991dc494395e09ca29da2372ed2840080d31372 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Id99c83537b1e0ddbfb2f2b8b2b0cfc131df12fe4