OSDN Git Service

Merge remote-tracking branch 'origin/klp-dev-plus-aosp' into klp-dev-plus-aosp
authorQiwen Zhao <zhao@google.com>
Tue, 13 Aug 2013 01:13:13 +0000 (18:13 -0700)
committerQiwen Zhao <zhao@google.com>
Tue, 13 Aug 2013 01:13:13 +0000 (18:13 -0700)

Trivial merge