| commit | f05e2d25372a47f5ff3b2d0c122d5ca8c3786238 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 21 11:56:57 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 21 11:56:57 2013 -0700 |
| tree | 1ffcb3922d2cdfd6dd751ef2bb376d5739bf873e | |
| parent | 77caa0d0a7c0ca3e1729ee1d2ef597b60d73a1d9 [diff] | |
| parent | 2ced32fbd1fb954648d0c91b18fff0e0b22e03b7 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: Id59401f35b9a467ddcc56c2167d6c30bb6c3d3e9