tree a70bd92938b55f7913c2720cf6d8088cec5ea62b
parent d50660a259477149923d544bda4238d694b2a0d2
parent c8514ef019dfb1cd0611cbfc029b43e12a5c0d64
author Xin Li <delphij@google.com> 1510712086 +0000
committer android-build-merger <android-build-merger@google.com> 1510712086 +0000

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

Change-Id: I938a855277c3f61e4f6d09f54f7422fe2a145cef