OSDN Git Service

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

Trivial merge