tree cf9a61f962f9b7f94d2deabc4fa696a0b40d2d65
parent d726c72086ec38bcf56a42f34f3196ea99899214
parent 3a84b0330b9f45e17534f74a162921d342dc37bc
author Chih-hung Hsieh <chh@google.com> 1542214482 -0800
committer android-build-merger <android-build-merger@google.com> 1542214482 -0800

Merge "Fix new compiler errors." am: 32290d3463 am: fb8ce21007
am: 3a84b0330b

Change-Id: I08137ff6f275c2ea7e32b0e3419b913129af1117