tree f5cac0bf2fb7a31e276679a83c3f8f6d77e4e895
parent 1379690c8032dbb610c5cd92f03e3215b3e750d2
parent 3bc5b4f39bca47502a16923ee4b89644bf4fa15a
author Xin Li <delphij@google.com> 1510711999 +0000
committer android-build-merger <android-build-merger@google.com> 1510711999 +0000

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

Change-Id: If712284337f15a103ad05a607088cd9ca1fe71d9