tree 39e9e4e4e2fd2fc3a17707b520a70f5602f72eb9
parent b1fc5bfcfb8634396c200f06777d1f6928b66ffc
parent 25af42f8bff5a973205bbc36d8617a133e908c51
author Yi Kong <yikong@google.com> 1527787447 -0700
committer android-build-merger <android-build-merger@google.com> 1527787447 -0700

[automerger skipped] Merge "[DO NOT MERGE] Fix enum-compare-switch warning"
am: 25af42f8bf  -s ours

Change-Id: Iccbf88e16b0a3f8ba75a029848a3ff235176b2a3