summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Xie <dxie@google.com>2015-09-01 20:35:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-01 20:35:37 +0000
commita6822bc2c49ad2465531bbbfdaf43b62b3faec8c (patch)
tree3c33a58425b68749714b711ef240fa05104b5a17
parentae55367e2ce74cdddee15ee556092f9377f51ca2 (diff)
parentd540875fcdd72bdf907d39f61081a005dd1200fe (diff)
downloadlibcore-a6822bc2c49ad2465531bbbfdaf43b62b3faec8c.zip
libcore-a6822bc2c49ad2465531bbbfdaf43b62b3faec8c.tar.gz
libcore-a6822bc2c49ad2465531bbbfdaf43b62b3faec8c.tar.bz2
am d540875f: (-s ours) am e2194cca: (-s ours) am d9ba9afc: (-s ours) am 27c6acaf: (-s ours) am f6fecb58: (-s ours) am df000639: (-s ours) am 2b6c3536: (-s ours) am 91994f09: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into ki
* commit 'd540875fcdd72bdf907d39f61081a005dd1200fe':
0 files changed, 0 insertions, 0 deletions