OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Mon, 14 Jan 2013 15:49:06 +0000 (07:49 -0800)
committerThe Android Automerger <android-build@android.com>
Mon, 14 Jan 2013 15:49:06 +0000 (07:49 -0800)
commit92994a964b5c57bfe6062255c46466a29c627f8b
tree04cf5225f74f4042a7e01079bf221ef6fd119910
parent2ce71aa0622d8b2caf7d9dc8274e7a29902b28aa
parentb8b91aff3fc0abaec131dfda8cc2bd19ded536e9
merge in master-release history after reset to master