| commit | d59d0d7a7248246d43a58fe417880867a34631f9 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Sep 04 22:10:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 04 22:10:33 2015 +0000 |
| tree | 4436717d100ff61279c0a332eded42738bd034a4 | |
| parent | 45101b8ebb8d2261c1733d305f5e165971ef7dc1 [diff] | |
| parent | aad953fae0bfad5c06fcb60bd1b527312f387d1e [diff] |
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 'aad953fae0bfad5c06fcb60bd1b527312f387d1e': DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE