tree b3f4f3eb14cec38d0866aab3aa26246d95a25c7e
parent cb3bba3c4ee4652e12c81185ab9a648db20bb0dd
parent d69fa0a09af7e9a524751dac1522c951abd92530
author Tadashi G. Takaoka <takaoka@google.com> 1368425600 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1368425600 +0000

Merge "Support multiple condition for getDeviceOverrideValue"