tree 04bd0405813e702013280618436b249879d97626
parent d10e68940482d4b40eee04f28866d4c74b6bc347
parent d229eec371bb2b27c882683fae842bdf69298c46
author Chih-hung Hsieh <chh@google.com> 1513130835 +0000
committer android-build-merger <android-build-merger@google.com> 1513130835 +0000

Merge "Fix compiler warnings."
am: d229eec371

Change-Id: Ia165854532a0e2ef98b712db6f0277576c60a497