tree 66856e63df8b3f30ad54277a94bf336e6a16f312
parent 0a3de2fde7f40b6e111db85af17675bc6e25c6b0
parent 3779295f828ab6d97badd9bd04702c58a00aa2fb
author Josh Gao <jmgao@google.com> 1503358913 +0000
committer android-build-merger <android-build-merger@google.com> 1503358913 +0000

Merge changes I2270cc0a,I55e5dc5a
am: 3779295f82

Change-Id: I72f3a3272bcce4f0e4f24050e5035810be040ec9