OSDN Git Service

Merge changes Ie23877ac,I262f6be8 am: f2197e4 am: 39881e2
authorHiroshi Yamauchi <yamauchi@google.com>
Thu, 7 Apr 2016 21:59:38 +0000 (21:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Apr 2016 21:59:38 +0000 (21:59 +0000)
am: 380b1bd

* commit '380b1bd299577fc14c07f4ea2a2552369bfe42a9':
  Revert "Disable some image_test cases with concurrent collector."
  Fix image_test for the CC collector.

Change-Id: Ic679605cbe3345e9e08ca905f3b02abb709f2096


Trivial merge