OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Thu, 4 Apr 2013 14:49:53 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 4 Apr 2013 14:49:53 +0000 (07:49 -0700)
commitc23735186aac25215423b26f18abc1727b9e5674
tree900dce9d6758c2f29478bb53998fa6eabfb18c67
parentd2006981e41c3ac5208ecb9ae55ef65feb85764e
parentb6011bc86c675b17d3b46dfb64130d7e51a9f3e0
merge in master-release history after reset to master