OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Mon, 25 Feb 2013 15:49:19 +0000 (07:49 -0800)
committerThe Android Automerger <android-build@android.com>
Mon, 25 Feb 2013 15:49:19 +0000 (07:49 -0800)
commit66fd9b116fa73ce6f3c34f0178e7a1d387e60b2d
treec54e66f03226c81f5f49a7f5291d4b5ff69c54be
parent7ef64e31a9bfa41603fd531176cd8446f680bce2
parent2793b28e6a1927a70b476d61b9bff5b7d8cb3cdc
merge in master-release history after reset to master