commit | 6992ac947b0e953b0d82101bac3941f8d3a4e138 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 08:22:40 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 08:22:40 2013 -0700 |
tree | 24c693aeb475d637790f4fbfd16f1e0ee270de8e | |
parent | 3277d134000189524a69b1c95eb65a60e34a9e94 [diff] | |
parent | 669b12d1d8f1aea44f3dee663f20bfcf87c5fac1 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: I47fca5203adfc0e37cd63bcc6454c9cc79abc54b