OSDN Git Service

Merge changes Ie23877ac,I262f6be8
authorHiroshi Yamauchi <yamauchi@google.com>
Thu, 7 Apr 2016 21:18:29 +0000 (21:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Apr 2016 21:18:29 +0000 (21:18 +0000)
commit39881e263e6844766dbca14509226b87e5cf65f8
treebc54e778acc05b816a8b60d4217d880a896ccd74
parent5b2f8e07a1859762c30c3a1f792594c34ffc0b18
parentf2197e43f42499be852a0fce2d755f25e2007be8
Merge changes Ie23877ac,I262f6be8
am: f2197e4

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

Change-Id: I91f1527c9b32cc3889b64a8c30486ee9c0a29f16