tree e5125a1a9b1918e96b468bb9420a92f26d5b980d
parent 6461ddb4e1ea95bd416995c50e2cb93d93d9d390
parent 74b3ecf485254d8cb4ae2b1d4d5221454738a58d
author Brian Carlstrom <bdc@google.com> 1407177451 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407177451 +0000

am 74b3ecf4: Merge "Disable compilation based on vold.decrypt. [frameworks/native]"

* commit '74b3ecf485254d8cb4ae2b1d4d5221454738a58d':
  Disable compilation based on vold.decrypt. [frameworks/native]