OSDN Git Service

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
authorBill Yi <byi@google.com>
Wed, 24 Aug 2016 18:18:47 +0000 (11:18 -0700)
committerBill Yi <byi@google.com>
Wed, 24 Aug 2016 18:18:47 +0000 (11:18 -0700)

Trivial merge