OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Wed, 9 Jan 2013 15:49:05 +0000 (07:49 -0800)
committerThe Android Automerger <android-build@android.com>
Wed, 9 Jan 2013 15:49:05 +0000 (07:49 -0800)
commit2fcb7073fae5690dd92b15e4c449561716da26e0
tree256756354dedcc061797e86d4a0a597086df060b
parentfc1c1a217b36605c3d613aa5ed5d422990bdd6eb
parent55cde701b0c9b008cac13f5e02ab10e1a7f59901
merge in master-release history after reset to master