| commit | aad953fae0bfad5c06fcb60bd1b527312f387d1e | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Sep 04 21:58:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 04 21:58:49 2015 +0000 |
| tree | d73b45c70aa98ef0b5cc0b1cff1181235413ce4f | |
| parent | 9f275caac3c90dac2d91c2faf94f4179c9d90fb7 [diff] | |
| parent | 92cec14754d8ad8d9018d0dcb3767663492bc8da [diff] |
am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev * commit '92cec14754d8ad8d9018d0dcb3767663492bc8da': DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE