tree 7f067f8750f5379cfdc99ee2d9a0b6b607d04dfa
parent aef5e7f1d290a5fff19a85bda1ee077d122428b5
parent e98b92a8046d08ea1056b6f917555d85ef76887f
author Brandon Maxwell <maxwelb@google.com> 1474942103 +0000
committer android-build-merger <android-build-merger@google.com> 1474942103 +0000

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

Change-Id: Ic5d4e87dc6811aae4d5347290110faeda2857eca