summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Xie <dxie@google.com>2015-07-31 23:39:52 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-07-31 23:39:52 +0000
commitba08bcd54a1bcc264d580c7e8619be0a2731f1ec (patch)
tree3e8036136adde4c420932270bc17c99b1263a53d
parent1f2b629a224e675b9a2eaa7e44d0d6c5701046a1 (diff)
parent91994f09dce81de7b307aa88ce3c1c56cb0c7683 (diff)
downloadlibcore-ba08bcd54a1bcc264d580c7e8619be0a2731f1ec.zip
libcore-ba08bcd54a1bcc264d580c7e8619be0a2731f1ec.tar.gz
libcore-ba08bcd54a1bcc264d580c7e8619be0a2731f1ec.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
automerge: 91994f0 * commit '91994f09dce81de7b307aa88ce3c1c56cb0c7683': DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE
0 files changed, 0 insertions, 0 deletions