OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Thu, 7 Mar 2013 15:50:11 +0000 (07:50 -0800)
committerThe Android Automerger <android-build@android.com>
Thu, 7 Mar 2013 15:50:11 +0000 (07:50 -0800)
commita1e56a0c02e8ba837e9a67eee4be60fa3d395139
treebcc71d525b39e001c817b3f0f532bc065d753b1b
parenteb6d9e41338706df4695a5b642843c0d292b8e1d
parent1bac1681c60a68d88ee44db1ec95f93ffe5db1bf
merge in master-release history after reset to master