diff options
author | Daniel Xie <dxie@google.com> | 2015-09-15 01:10:09 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-15 01:10:09 +0000 |
commit | 75090d49a4f7cd5372e03b92821ba25e59a761df (patch) | |
tree | 4a38d981fef0682951f25a6cbb588105046dd40e | |
parent | 13405d7548b81316bb154483b666f0370ff410a1 (diff) | |
parent | ebc4ca8222be974b201fe35e599533f99a0c1915 (diff) | |
download | libcore-75090d49a4f7cd5372e03b92821ba25e59a761df.zip libcore-75090d49a4f7cd5372e03b92821ba25e59a761df.tar.gz libcore-75090d49a4f7cd5372e03b92821ba25e59a761df.tar.bz2 |
am ebc4ca82: (-s ours) am c5a96cff: (-s ours) am 3a8c0d1e: (-s ours) am cd8cc93f: (-s ours) 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 ki
* commit 'ebc4ca8222be974b201fe35e599533f99a0c1915':
0 files changed, 0 insertions, 0 deletions