tree 577df1cb0fa236caa5489f10c803f8ee2c99f3ac
parent be4578f00951f51579089ee8ac60c3465bbb5e51
parent 6a831e02b67776c2600d7069a77fef0211432cb9
author Tao Bao <tbao@google.com> 1490387667 +0000
committer android-build-merger <android-build-merger@google.com> 1490387667 +0000

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

Change-Id: If512cbe096ad18388fea2800d12182832d0ecda8