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)
Bug: 112535855
Change-Id: I3626845eacae13ff02f110290b2bb063c992fcd1


Trivial merge