OSDN Git Service

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

Change-Id: Ieac8c38581c5abcd20e2001009d2071fbbc12ff7