tree d5d60a14c70ca1fdcacf37d175668c5f8d81f9a3
parent 8c4386ccd34c6f73174b1405ee8ca175740c9e4b
parent 40cd14f3e6b415c90906be0f34fcc8c5b7e730a3
author Brandon Maxwell <maxwelb@google.com> 1474943390 +0000
committer android-build-merger <android-build-merger@google.com> 1474943390 +0000

Merge "Fixing display option for KO, JA, ZH" into nyc-mr1-dev am: 9bdcff7bdf am: e98b92a804
am: 40cd14f3e6

Change-Id: I9e6a556876a2ae485887b7b159329f582179a44a