commit | 0532b398ad3f817f9756bd671ebd2018d1a96291 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 03 14:04:12 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 03 14:04:13 2013 -0700 |
tree | cf842e2e979e896b04fcb3af44a1fb2cb1eede20 | |
parent | 6f7e39a6827598492ffbfeedf4c47445519f272e [diff] | |
parent | 2d2519d9e229572ef9083b8fd2ee5ff64f36c8b2 [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: I8e30c075ddfaf3712aacd89a2a90c30ea245193a