summaryrefslogtreecommitdiffstats
path: root/luni/src
diff options
context:
space:
mode:
authorDaniel Xie <dxie@google.com>2015-07-31 23:38:06 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-07-31 23:38:06 +0000
commit91994f09dce81de7b307aa88ce3c1c56cb0c7683 (patch)
tree6ccbb06274c0e5ab0d2e7bdf6f43613478b61ae2 /luni/src
parentc25d8adf4bc85882d0f18858db3724039e5affa5 (diff)
parent8a012b3a3ce662370beef99a02a4c353edd66c6b (diff)
downloadlibcore-91994f09dce81de7b307aa88ce3c1c56cb0c7683.zip
libcore-91994f09dce81de7b307aa88ce3c1c56cb0c7683.tar.gz
libcore-91994f09dce81de7b307aa88ce3c1c56cb0c7683.tar.bz2
Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev
automerge: 8a012b3 -s ours * commit '8a012b3a3ce662370beef99a02a4c353edd66c6b': DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE
Diffstat (limited to 'luni/src')
0 files changed, 0 insertions, 0 deletions