diff options
| author | Daniel Xie <dxie@google.com> | 2015-07-31 23:43:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-31 23:43:35 +0000 |
| commit | 4366a97c21a11cf83c06147adb312761f476f5b6 (patch) | |
| tree | 3e8036136adde4c420932270bc17c99b1263a53d | |
| parent | 05c1ad2bf948f2ff842c3b4c9b41cab0677dfa52 (diff) | |
| parent | ba08bcd54a1bcc264d580c7e8619be0a2731f1ec (diff) | |
| download | libcore-4366a97c21a11cf83c06147adb312761f476f5b6.zip libcore-4366a97c21a11cf83c06147adb312761f476f5b6.tar.gz libcore-4366a97c21a11cf83c06147adb312761f476f5b6.tar.bz2 | |
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 'ba08bcd54a1bcc264d580c7e8619be0a2731f1ec':
DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE
0 files changed, 0 insertions, 0 deletions