OSDN Git Service

Merge stage-dr1-aosp-master into stage-aosp-master
authorXin Li <delphij@google.com>
Mon, 13 Aug 2018 20:01:17 +0000 (13:01 -0700)
committerXin Li <delphij@google.com>
Mon, 13 Aug 2018 20:01:17 +0000 (13:01 -0700)
commit4a1070631d814bb845d02fe5b88fb522635ef566
treed9534d9f946bdb34d494eb1c6a5fa63a2314f0fc
parent9559bbb3a83b551dc5e8476a1a7584966ade531c
parent89a4d6cc6203688da700b875995f68ac3b68e0ba
Merge stage-dr1-aosp-master into stage-aosp-master

Bug: 112535855
Change-Id: I3626845eacae13ff02f110290b2bb063c992fcd1