tree 473d99337c80901b42315542bbfbc2c46d970eec
parent 11bdbcaeb4127de9d9c0ca780acc1afb316a767d
parent 9bdcff7bdf72dd69f43c2b3d6fc20474130008c0
author Brandon Maxwell <maxwelb@google.com> 1474942004 +0000
committer android-build-merger <android-build-merger@google.com> 1474942004 +0000

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

Change-Id: I5adb8fb17d4f00ac39d4ce3b78997af36556f20d