OSDN Git Service

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

Trivial merge