OSDN Git Service

am 20bac14e: Merge changes I69c064b0,I1972c5af
authorBrian Carlstrom <bdc@google.com>
Mon, 4 Aug 2014 18:32:59 +0000 (18:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 4 Aug 2014 18:32:59 +0000 (18:32 +0000)
commit5a9b135f983aa080fccbff29a328d1fc231d7e4a
tree60366aa9fa10e0404c47b3be30ce035b297aae03
parentbccea16ec1dc0d91750dc2b6932c4d370b365b2a
parent20bac14e521dd551addd8541380f1d9b6c910bd2
am 20bac14e: Merge changes I69c064b0,I1972c5af

* commit '20bac14e521dd551addd8541380f1d9b6c910bd2':
  Move image classes options from art to AndroidRuntime [frameworks/base]
  Disable compilation based on vold.decrypt. [frameworks/base]