tree 79c190ed1f52ac3f2fd513675beedcc58720d70e
parent c2c0dce22e14e176a46188f9f8635aaffcbb08b1
parent 4a4445a4d21eeff808a8abaa7a87f0b3d5f223b7
author Chih-hung Hsieh <chh@google.com> 1510696029 +0000
committer android-build-merger <android-build-merger@google.com> 1510696029 +0000

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

Change-Id: I1f2d319bf247feb09d214d0fe8500c2dbfcb171f