OSDN Git Service

Merge changes Idae36efa,I6613c971 into lmp-dev
authorBrian Carlstrom <bdc@google.com>
Thu, 7 Aug 2014 05:28:37 +0000 (05:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 6 Aug 2014 23:54:36 +0000 (23:54 +0000)
commitbb6adf0d5af8c18a85035dce80ec6b5425c318ca
treea6995c09895abf3117a5383d3ed113bf91232526
parent1abe557b6e79ed4acbd4d8d35c604d2a93974c83
parent41cd9eb42471e99831fbbbb72b841202bbf33648
Merge changes Idae36efa,I6613c971 into lmp-dev

* changes:
  Disable compilation based on vold.decrypt. [frameworks/native]
  Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]