tree 821cda819ea987382bec53258f232a0fedf856f6
parent 3a4abf4e965a0a051fa83a8dbaa778563a6b5174
parent e725faa186ff916ff7b3fb7d04f7026773498580
author Chih-hung Hsieh <chh@google.com> 1512515095 +0000
committer android-build-merger <android-build-merger@google.com> 1512515095 +0000

Merge "Fix clang compiler warnings." am: 7553b18b49
am: e725faa186

Change-Id: Id8dacf8a867b091c7a97e1af49cf5006acdc4c56