tree c5384ccf1b4c014763cb1039ea1e90d95861b3a3
parent 49fb89d3a0853ef77ecd533bec586abc65754857
parent 7c785aa8bfcb6601b171781d9ca96f1800a84f1f
author Chih-hung Hsieh <chh@google.com> 1540236146 -0700
committer android-build-merger <android-build-merger@google.com> 1540236146 -0700

[automerger skipped] Merge "Allow implicit-fallthrough warnings locally. DO NOT MERGE." am: e1a209a6a9  -s ours am: 03dc4f83d5  -s ours
am: 7c785aa8bf  -s ours

Change-Id: If713c6fd25215582955337bed9ae3326941071db