OSDN Git Service

Merge stage-dr1-aosp-master into stage-aosp-master
authorXin Li <delphij@google.com>
Mon, 13 Aug 2018 20:01:15 +0000 (13:01 -0700)
committerXin Li <delphij@google.com>
Mon, 13 Aug 2018 20:01:15 +0000 (13:01 -0700)
commita6d0b94b378c60dc187b74184c62bc26bff52fa1
treed4c854364d678bd83b49a9cbe9d90552c96be68d
parent240d59bd88e08c6d64eda53cd2c003e7fc95e101
parenta6a3ac640fac94ce6ea7ea07deacb39c16bbb08b
Merge stage-dr1-aosp-master into stage-aosp-master

Bug: 112535855
Change-Id: I20d6496a784ff897f695972606265684b9f8f0ae