am ec83457d: Merge "Support multiple condition for getDeviceOverrideValue"

* commit 'ec83457d726679e81d0b0ec12c9e7a284464133e':
  Support multiple condition for getDeviceOverrideValue
tree: b3f4f3eb14cec38d0866aab3aa26246d95a25c7e
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk