OSDN Git Service

merge in master-release history after reset to 9cba0f12682eadc0d297468fd547847c2f99e4b5
authorThe Android Automerger <android-build@google.com>
Sat, 17 May 2014 12:49:06 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 17 May 2014 12:49:06 +0000 (05:49 -0700)

Trivial merge