summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Xie <dxie@google.com>2015-09-01 09:14:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-01 09:14:49 +0000
commit2b6c35362abafa59dd5bde1e33f6c2b77803d31e (patch)
tree6ccbb06274c0e5ab0d2e7bdf6f43613478b61ae2
parentedef8836113a0fd3f9b72be99ed997eebf7809ba (diff)
parent91994f09dce81de7b307aa88ce3c1c56cb0c7683 (diff)
downloadlibcore-2b6c35362abafa59dd5bde1e33f6c2b77803d31e.zip
libcore-2b6c35362abafa59dd5bde1e33f6c2b77803d31e.tar.gz
libcore-2b6c35362abafa59dd5bde1e33f6c2b77803d31e.tar.bz2
am 91994f09: (-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
* commit '91994f09dce81de7b307aa88ce3c1c56cb0c7683': DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE
0 files changed, 0 insertions, 0 deletions