OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Wed, 27 Mar 2013 14:50:22 +0000 (07:50 -0700)
committerThe Android Automerger <android-build@android.com>
Wed, 27 Mar 2013 14:50:22 +0000 (07:50 -0700)
commitf4af21a09e55acdad8a59b5c3dd1c9242f8247c9
tree9e3a8461c5cfab8f591ff93a9cfab7ab65f83726
parent018c4e19b7a30da50db0d4e119e38dc28677e710
parent32839cd317fba773364b361f1ca9c49d5bd7218b
merge in master-release history after reset to master