summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Xie <dxie@google.com>2015-09-04 22:19:21 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-04 22:19:21 +0000
commitcd8cc93f3558fde16bf25669cb9a57522c8b223a (patch)
tree299434f810e5e249959f228350541098f1d84f92
parent2ab5a4898ae61056b8eee8231f0761245dd93295 (diff)
parentd59d0d7a7248246d43a58fe417880867a34631f9 (diff)
downloadlibcore-cd8cc93f3558fde16bf25669cb9a57522c8b223a.zip
libcore-cd8cc93f3558fde16bf25669cb9a57522c8b223a.tar.gz
libcore-cd8cc93f3558fde16bf25669cb9a57522c8b223a.tar.bz2
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 kitkat-cts-dev
* commit 'd59d0d7a7248246d43a58fe417880867a34631f9':
0 files changed, 0 insertions, 0 deletions