| commit | 7e1b93cbd5b647db496cc587c90a012af0529dff | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 08 15:31:01 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 08 15:31:01 2013 -0700 |
| tree | 8e0d8807f3445293876d856454d0212e86e1e8b1 | |
| parent | a6e97a31df26b3e9062e9ab5342e8fd6070ffb0b [diff] | |
| parent | 2145e71b107f88b85df6abd58d2e7b79eb781a61 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: Ifa6e38073ef648695efea3b895ef1fb64d39471e