| commit | f08a5e12a760b9d8661f6ad8ed04fd83f630ca90 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 10 08:13:31 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 10 08:13:31 2013 -0700 |
| tree | 6ff5ee812774f0cc845978015b72fa156d21db50 | |
| parent | 1d1550981c36e340f5a7e155f881ed5fbba7199c [diff] | |
| parent | bd9baad405bcdce7ce3c1e1c8aabf0ccb93fc17d [diff] | |
| parent | 25fd22f94993e58dca6affd556aed66adc0ad193 [diff] |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: Iad34e8a71fa6f1a0129fe2a0287055eea2c75129