am 4c6fe8ed: am aaf7d70b: am 6f647842: am ec83457d: Merge "Support multiple condition for getDeviceOverrideValue"

* commit '4c6fe8ed668cba4f3d6dcf66763bab375b4eb1fd':
This commit is contained in:
Tadashi G. Takaoka 2013-05-15 12:57:45 -07:00 committed by Android Git Automerger
commit de1115a8fe

Diff content is not available