OSDN Git Service

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
authorXin Li <delphij@google.com>
Wed, 15 Nov 2017 00:38:21 +0000 (16:38 -0800)
committerXin Li <delphij@google.com>
Wed, 15 Nov 2017 00:38:21 +0000 (16:38 -0800)
Change-Id: Ia544030482f2f694bd009e2e5b39d599dd20b92e


Trivial merge