OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Mon, 17 Dec 2012 15:49:39 +0000 (07:49 -0800)
committerThe Android Automerger <android-build@android.com>
Mon, 17 Dec 2012 15:49:39 +0000 (07:49 -0800)
commit11506e5909d9b753152876ad94aa3fd40067e443
treee1882c80becdd0e49a52bf705ed6f770e3da84a6
parentba34779c3b0809483521f199e0eba75e77814088
parent5049c7d4ef1d67d70bfeca8aceb5c74e71b29d6c
merge in master-release history after reset to master