tree 5511f79b35c47cbcf2070c5e491c589a2712b5f8
parent 9cec41f03a1f8ba7d5a82ec07cc67b06e37d17c1
parent 93e2672d638c2c866364aec9ca0535061fce507a
author Chong Zhang <chz@google.com> 1464827018 +0000
committer android-build-merger <android-build-merger@google.com> 1464827018 +0000

Merge "Merge "Do not sanitize override config for fullscreen" into nyc-dev am: 65f1973ba9 am: 2ae97b4cf2" into nyc-mr1-dev-plus-aosp
am: 93e2672d63

* commit '93e2672d638c2c866364aec9ca0535061fce507a':

Change-Id: I10e0063e98e8b2027e59c08e3308468b16348fad