tree 938cb71bb11aa7beaef28b5d7b8a48c740190353
parent 1a6b2ca83c879a779a8d1d593e7f08519f47b0b2
parent ec6029e3b4b271a63ad04c5eb3936c1147b5df89
author Haibo Huang <hhb@google.com> 1530567194 -0700
committer android-build-merger <android-build-merger@google.com> 1530567194 -0700

Support GIT upstream am: 24950e7978
am: ec6029e3b4

Change-Id: I3804c44d3f314e6cbb256c5b34095717ec7e30c2