tree 7cc246329b1ea3670696d0a3577f5be9e0b26cda
parent 836f184ad6da4abf088973cd40a05b1d6351c4bc
parent 1db35330e4b5e65527e49d0a6abbbfca632006c6
author Xin Li <delphij@google.com> 1510710833 +0000
committer android-build-merger <android-build-merger@google.com> 1510710833 +0000

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 1db35330e4

Change-Id: Ia9dbdf5652dc7fbd5c299ca0f7160865c856aae6