tree 28b3c4bb75a92b78fa96e3d05e5b90cad0a590e0
parent b6f596a78e52a50a224fd07e7a80f7541a133c9b
parent 93d7facd1beef843f55397c6db5ab605fbfbeb28
author Xin Li <delphij@google.com> 1510709845 +0000
committer android-build-merger <android-build-merger@google.com> 1510709845 +0000

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

Change-Id: Idc2f73a13852597650fde6a00198450154a2ca7e