tree a6995c09895abf3117a5383d3ed113bf91232526
parent 1abe557b6e79ed4acbd4d8d35c604d2a93974c83
parent 41cd9eb42471e99831fbbbb72b841202bbf33648
author Brian Carlstrom <bdc@google.com> 1407389317 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1407369276 +0000

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]