tree 4b9be7bd71a56caf18b724fa7764950eeb4ffff5
parent 0c78426e70db6e4d76008c1f7fff9a316e54897f
parent 2c681345e89181f2986a74c297f54082c992be07
author Xin Li <delphij@google.com> 1555002346 -0700
committer android-build-merger <android-build-merger@google.com> 1555002346 -0700

Merge changes Ieddc1113,Ia12217b3
am: 2c681345e8

Change-Id: Icce62013f0828569c78b3aad41a8d7180806bd16