tree b55861a02a6015e2a4e188717002d036f8f30868
parent 27a15cb4bfafc79335e7b89cdaa338bd3044a880
parent f01744ee4f06bf27a2e703f82149b0174365bed8
author Xin Li <delphij@google.com> 1510712884 +0000
committer android-build-merger <android-build-merger@google.com> 1510712884 +0000

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

Change-Id: I82c739f82dde402c05e4d6eb4df210bde3f1c5c1