OSDN Git Service

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

Trivial merge