OSDN Git Service

merge in master-release history after reset to b654a07263e3b163fc1a58f7df717f2d2fb5c7f1
authorThe Android Automerger <android-build@google.com>
Tue, 20 May 2014 12:50:38 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 20 May 2014 12:50:38 +0000 (05:50 -0700)

Trivial merge