OSDN Git Service

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
authorBill Yi <byi@google.com>
Tue, 10 Mar 2015 21:56:17 +0000 (14:56 -0700)
committerBill Yi <byi@google.com>
Tue, 10 Mar 2015 21:56:17 +0000 (14:56 -0700)

Trivial merge