tree 1baa232cc6c4333f68e40e2e30bc86a8c930645d
parent 380a0c5e4a049ab06499fc42c1941e91d31b9c7e
parent 59522001f56f9e6e977f62e90ca481fb03a83bdf
author Xin Li <delphij@google.com> 1510713222 +0000
committer android-build-merger <android-build-merger@google.com> 1510713222 +0000

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

Change-Id: I21a3bb7b49f10fa9d0e95fad2806d33cad5f7413