OSDN Git Service

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

Change-Id: I8d0a6b7edb32c8a300bce902df909395f61f4373