| commit | 2f387da0ac1495f80ca5bc4c928e2b9c1e3fb040 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 10 08:14:13 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 10 08:14:13 2013 -0700 |
| tree | 1ec6f6ed240b9c60d0a0d068cdb85b36bbfa2808 | |
| parent | 05ee43dc288553d418d906e3681b25dc55a2144d [diff] | |
| parent | c597da45baed1031300bc3bba93d092abff06a6b [diff] | |
| parent | a063ccb00e9d8bd983fdb797528d6de5517ac47e [diff] |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: I974082d633cb4b996ec0fb718be4f487f42bf0fc