OSDN Git Service

am daf0b895: Cherry-pick f0e5e933 from master.
authorXavier Ducrohet <xav@android.com>
Fri, 7 Jan 2011 21:50:42 +0000 (13:50 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Jan 2011 21:50:42 +0000 (13:50 -0800)
* commit 'daf0b895e8e0c952cc8563972d74a5e06fba7d0b':
  Cherry-pick f0e5e933 from master.


Trivial merge