OSDN Git Service

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

Trivial merge