tree b3f4f3eb14cec38d0866aab3aa26246d95a25c7e
parent 01c133d72e5cbba33148ec478a3f1ab0c0c3ad5f
parent ec83457d726679e81d0b0ec12c9e7a284464133e
author Tadashi G. Takaoka <takaoka@google.com> 1368425715 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368425715 -0700

am ec83457d: Merge "Support multiple condition for getDeviceOverrideValue"

* commit 'ec83457d726679e81d0b0ec12c9e7a284464133e':
  Support multiple condition for getDeviceOverrideValue