tree cf9a61f962f9b7f94d2deabc4fa696a0b40d2d65
parent 4fb96512e127d1ee91e292afb695962f272e3f91
parent fb8ce21007cc57a5b4c77b9da43797a3120d750a
author Chih-hung Hsieh <chh@google.com> 1542214220 -0800
committer android-build-merger <android-build-merger@google.com> 1542214220 -0800

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

Change-Id: Ie0e8344446e894f218ffa7d9d7c3ae1493c6a89b