tree 4639669074ff788bb4c7ce99fdd877cdfb01225a
parent 4db650ca100aa94aca7c8abcf9085b62842ad6da
parent 6b3df6486e4e3d79802e38b99d9d2057df0fc7c7
author Tao Bao <tbao@google.com> 1490387818 +0000
committer android-build-merger <android-build-merger@google.com> 1490387818 +0000

Merge "Removed C-style casts" am: 110155a604 am: 6a831e02b6
am: 6b3df6486e

Change-Id: Ib917ebb9e4bd7a5cd7dcd785593f0a2f4ef0aefb