| commit | 2ca8825aff762b5657f4f0b661bf20c7e2957c60 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 24 11:44:56 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 24 11:44:56 2013 -0700 |
| tree | d80b14c181fd197af7e12434b524b04961ba10f3 | |
| parent | 70b89b2bb95022a182437996697cce7c15e6d8a7 [diff] | |
| parent | 5c59dc6798e52843b0c41ab4a8ae042fab2f4504 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: I96ddc0a7186ed26fd445bc47a16c7c03a3d7c846