OSDN Git Service

am daf0b895: (-s ours) Cherry-pick f0e5e933 from master.
authorXavier Ducrohet <xav@android.com>
Tue, 25 Jan 2011 23:39:11 +0000 (15:39 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Jan 2011 23:39:11 +0000 (15:39 -0800)
commit0ad1c69d30d5a0e7820e42c37792525f7bdf4a3a
treeb4b8f199ba1be5e675c1b233a5dae3a2d02ec644
parent27fc0176e4a6c41dcfc57f179868fc7b17ba07ec
parentdaf0b895e8e0c952cc8563972d74a5e06fba7d0b
am daf0b895: (-s ours) Cherry-pick f0e5e933 from 

* commit 'daf0b895e8e0c952cc8563972d74a5e06fba7d0b':
  Cherry-pick f0e5e933 from master.