| commit | bb3a943d1bd9cb8f7cca76850d432cfb2a6307e1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 13 08:22:53 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 13 08:22:53 2013 -0700 |
| tree | 1c502a5d9cd987173350e78997be1e517b34c4d3 | |
| parent | a5520e76911421956c7c4fe4e28ac60c64a276b9 [diff] | |
| parent | 8720f867c4c292bf71a73078ec287392ad7ed788 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: Id19d096814424b1c1253d633f9bc0e18d53dc360