tree e6184396035b283ba97ac89cdde2cd0d02ddf98e
parent 273b88165c431f132ba7fc0d7ff5b33cf19c4bbb
parent c8ec93afd36ced43e0702f87f8ac1a5e4de36cf1
author Chih-hung Hsieh <chh@google.com> 1510694788 +0000
committer android-build-merger <android-build-merger@google.com> 1510694788 +0000

Merge "Fix trivial compiler warnings" am: 2df83399a6
am: c8ec93afd3  -s ours

Change-Id: I88682dd80af09d71a4759cf370a2538ddc5866c2