| commit | 26b8799794b9a4d2c96e1b02bcd59e9e4754acf5 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Jul 31 23:54:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 31 23:54:51 2015 +0000 |
| tree | 3e8036136adde4c420932270bc17c99b1263a53d | |
| parent | 05c1ad2bf948f2ff842c3b4c9b41cab0677dfa52 [diff] | |
| parent | 4366a97c21a11cf83c06147adb312761f476f5b6 [diff] |
am 4366a97c: (-s ours) am ba08bcd5: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev automerge: 8a012b3 -s ours automerge: 91994f0 * commit '4366a97c21a11cf83c06147adb312761f476f5b6': DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE