Merge "resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp" into...
Merge "resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
automerge: 935fd8d0
* commit '935fd8d0':
Frameworks/base: Wall Werror in media/tests