OSDN Git Service

Merge commit 'eed5dceb4a0bc02f50f236ab191d30c49c58f610' into HEAD
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Dec 2013 20:38:20 +0000 (12:38 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Dec 2013 20:38:20 +0000 (12:38 -0800)
commit20ebefd966eed9da545ab645199c2f93ca93af20
tree861480695e14cdaaf8a499defcd1c1fc1d78bdca
parent047510b132e33c26607b4b93e806884aa4d13f19
parenteed5dceb4a0bc02f50f236ab191d30c49c58f610
Merge commit 'eed5dceb4a0bc02f50f236ab191d30c49c58f610' into HEAD