tree 9aeedb21eea6d280187bd225940f18f673915534
parent 42bf3e893e8097c24aac9b0072756febb7bc2c50
parent 8893c66d35a9e1691c8001817b1e9c33d2bf0a47
author Chih-hung Hsieh <chh@google.com> 1448385407 +0000
committer android-build-merger <android-build-merger@google.com> 1448385407 +0000

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

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