OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Wed, 3 Apr 2013 14:49:48 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@android.com>
Wed, 3 Apr 2013 14:49:48 +0000 (07:49 -0700)
commitb6011bc86c675b17d3b46dfb64130d7e51a9f3e0
treec2bd10ba7be7f9d2729e55187b952856e59dbaf9
parentd93dd2e92042a3d06e92487e4751c535c20633da
parentd65c9736c91b5231f97a61b5a372b44b5ad4ae08
merge in master-release history after reset to master