OSDN Git Service

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

Trivial merge