OSDN Git Service

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

Change-Id: I2ec761ede3888eb3cc2f89566b11aea0e721edbc