summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Xie <dxie@google.com>2015-09-04 21:45:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-04 21:45:17 +0000
commit92cec14754d8ad8d9018d0dcb3767663492bc8da (patch)
treed73b45c70aa98ef0b5cc0b1cff1181235413ce4f
parent9f275caac3c90dac2d91c2faf94f4179c9d90fb7 (diff)
parent8a012b3a3ce662370beef99a02a4c353edd66c6b (diff)
downloadlibcore-92cec14754d8ad8d9018d0dcb3767663492bc8da.zip
libcore-92cec14754d8ad8d9018d0dcb3767663492bc8da.tar.gz
libcore-92cec14754d8ad8d9018d0dcb3767663492bc8da.tar.bz2
am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev
* commit '8a012b3a3ce662370beef99a02a4c353edd66c6b': DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE
0 files changed, 0 insertions, 0 deletions