tree 97505d48574ca77fb1f9f3354da0d9bd1fdc7168
parent 9b61f65f8bd88897da58fc270d20a92ec520854e
parent 5bb7c30462172d86e461190bb1e3ac0296d13a79
author Xin Li <delphij@google.com> 1510708611 +0000
committer android-build-merger <android-build-merger@google.com> 1510708611 +0000

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 5bb7c30462

Change-Id: Ie92dd6656be973ec2253426cf3b2e04a564cb47b