OSDN Git Service

merge in master-release history after reset to 4c2b869a3a30b257acce46d470e92e835a9eb82c
authorThe Android Automerger <android-build@google.com>
Mon, 28 Apr 2014 12:49:59 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 28 Apr 2014 12:49:59 +0000 (05:49 -0700)

Trivial merge