OSDN Git Service

am b0994ed7: (-s ours) CherryPick 35530d from master to mr0. do not merge.
authorXavier Ducrohet <xav@android.com>
Mon, 24 Oct 2011 20:20:07 +0000 (13:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Oct 2011 20:20:07 +0000 (13:20 -0700)
commite33558752f7d87805883a4cecb32ae43afb09873
tree28eee3f42811afd37db117e8ea5ec72270f61958
parentd58d3c281b00646c1e665b3677c41156670e0e3b
parent724e6d05ebce56a2190c1f3a81a3f527fad5384a
am b0994ed7: (-s ours) CherryPick 35530d from master to mr0. do not merge.

* commit 'b0994ed7ffd31d02b9d66a470decfdfaf0d6f8ee':
  CherryPick 35530d from master to mr0. do not merge.