tree 5706ccb258f11e6140b7140966f4e5d0a155a114
parent 7c603c97641b123a9571327b6646de1e8aad1c02
parent 8f4c3d668dc9f6e37a09169ec51ed9b4b0c8efc6
author Xin Li <delphij@google.com> 1510710369 +0000
committer android-build-merger <android-build-merger@google.com> 1510710369 +0000

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

Change-Id: I2972f0f1a589d2ccb0946a5cce6d35af9d0582b5