tree bbbd0739556711089201e0448c444e8cf8bc547f
parent d640c1adb44a79bbeaa7ce113366baf7afa7c3bc
parent c82e679f39b44d99f7e87cd94a17853900a7443a
author Xin Li <delphij@google.com> 1510707966 +0000
committer android-build-merger <android-build-merger@google.com> 1510707966 +0000

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

Change-Id: Icc9a5e45a7157ea4a89dfab12273900acfaacb93