OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Fri, 21 Dec 2012 15:49:42 +0000 (07:49 -0800)
committerThe Android Automerger <android-build@android.com>
Fri, 21 Dec 2012 15:49:42 +0000 (07:49 -0800)
commitf5a36233e1bd9a51139d344a8bbb6ab05c5ba930
tree14543d508fb12417c526d878cee2468a1c52f40f
parent2d1eb74a8e5deed8b567426ce448a9e37b11cfee
parent072bd91f5a99630adf608afcbe2b2363a1b7cdce
merge in master-release history after reset to master