OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Fri, 19 Apr 2013 14:49:39 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 19 Apr 2013 14:49:39 +0000 (07:49 -0700)
commitdba4c8dd75383e78a7d535001eb54114b008582c
treed1998dafc1378b680341f2c44d64ec53606afa3a
parentdfc11ac5c2b1b2d4077eaa268a068d18bde36420
parentb97e6951fc35eda9b8a095577511f68290c70470
merge in master-release history after reset to master