OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Fri, 22 Mar 2013 14:49:57 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 22 Mar 2013 14:49:57 +0000 (07:49 -0700)
commitb66e615a520f13641eaec25e406bdf23f9e0f846
tree082dec3bf6cec5786d346141055d388074635277
parent5a94dfd8f8ee8490dce0f94d66fa8c5be1669acb
parent141b58a09bf9f402f832f9a618f6bcd2db63db74
merge in master-release history after reset to master