| commit | 5b734503a42beab7cc8d74d4fff20996cb6b5cb2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 08 15:33:43 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 08 15:33:43 2013 -0700 |
| tree | 21fccb2f0b22b130e7b6d1ba27b5275e3bac2981 | |
| parent | 8b686347266e79c32b33b0660731423ec9a9891d [diff] | |
| parent | b592da977ab429b9ff7a6800368538bc800c64f1 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: Id0d9eb3205906b409e735546b988f43a3bdcc0ae