tree 568745fe2995cc689a1e8892f315e605f2a82b57
parent 7ebc944935afc5245a9930e3f43ab1af4d5b6e6c
parent baec2d25f6ce1a6a4a2cdf00a6ccbb3deca22bcc
author Chih-hung Hsieh <chh@google.com> 1448385594 +0000
committer android-build-merger <android-build-merger@google.com> 1448385594 +0000

Merge "Add explicit cast to shut off clang warnings." am: f091dfe010 am: 8893c66d35
am: baec2d25f6

* commit 'baec2d25f6ce1a6a4a2cdf00a6ccbb3deca22bcc':
  Add explicit cast to shut off clang warnings.