OSDN Git Service

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

Trivial merge