| commit | cd8cc93f3558fde16bf25669cb9a57522c8b223a | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Sep 04 22:19:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 04 22:19:21 2015 +0000 |
| tree | 299434f810e5e249959f228350541098f1d84f92 | |
| parent | 2ab5a4898ae61056b8eee8231f0761245dd93295 [diff] | |
| parent | d59d0d7a7248246d43a58fe417880867a34631f9 [diff] |
am d59d0d7a: (-s ours) am aad953fa: (-s ours) 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 'd59d0d7a7248246d43a58fe417880867a34631f9':