OSDN Git Service

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

Trivial merge