| commit | f0db59627543ef0ae918039870de5583f5e475c9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 17 07:31:38 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 17 07:31:38 2013 -0700 |
| tree | f0aaa53a28e6e1bcf148974816f24fb33572c519 | |
| parent | c5ffd941710d24a59dd12608e3fc152510e70668 [diff] | |
| parent | d48861fdbb760de42c800d89318d686b9ac7f6ac [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: I648e611890e12e68d1be949fe474a2a5e19200a4