tree 50effcb301974ff6adbecf7a9142a52ba0ba9007
parent cddf5dbf67c32aa877697a2b96f4c2f79849d3bb
parent e4d65b681a58f30df2b38b95434f6a21555db6a5
author Tao Bao <tbao@google.com> 1525118035 -0700
committer android-build-merger <android-build-merger@google.com> 1525118035 -0700

Merge changes I78839ed4,I75ac0e26
am: e4d65b681a

Change-Id: I303e20e6d7f36a355f6cca9798c3c598fe10777b