OSDN Git Service

merge in master-release history after reset to 5c39bb4f5e6c1646497a900e5104d38e5b3d16de
authorThe Android Automerger <android-build@google.com>
Wed, 30 Apr 2014 12:49:24 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 30 Apr 2014 12:49:24 +0000 (05:49 -0700)

Trivial merge