OSDN Git Service

Merge changes Ie23877ac,I262f6be8 am: f2197e4
authorHiroshi Yamauchi <yamauchi@google.com>
Thu, 7 Apr 2016 21:56:02 +0000 (21:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Apr 2016 21:56:02 +0000 (21:56 +0000)
commit380b1bd299577fc14c07f4ea2a2552369bfe42a9
treeacc800d8efd529e9f4a9cbee8235161c79252ca0
parent6e88fe80e84788cdfcb93a9f599eabea06ef78fd
parent39881e263e6844766dbca14509226b87e5cf65f8
Merge changes Ie23877ac,I262f6be8 am: f2197e4
am: 39881e2

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

Change-Id: I226b9341418d659a8dc59ba1465a8023fd034c88