OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Thu, 21 Feb 2013 16:33:32 +0000 (08:33 -0800)
committerThe Android Automerger <android-build@android.com>
Thu, 21 Feb 2013 16:33:32 +0000 (08:33 -0800)
commitb7d867f7178a36d5919dfcec22ac275c72d35979
treed8872089aea8322195ac333e576a3c9407ac6c60
parentb2b7356645e9e094b23ab8bc2aaf563810f9eed2
parent841b07f49c6aaa425eae63b63dcef5e5cdcf76f9
merge in master-release history after reset to master