commit | e33558752f7d87805883a4cecb32ae43afb09873 | [log] [tgz] |
---|---|---|
author | Xavier Ducrohet <xav@android.com> | Mon Oct 24 13:20:07 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 24 13:20:07 2011 -0700 |
tree | 28eee3f42811afd37db117e8ea5ec72270f61958 | |
parent | d58d3c281b00646c1e665b3677c41156670e0e3b [diff] | |
parent | 724e6d05ebce56a2190c1f3a81a3f527fad5384a [diff] |
am b0994ed7: (-s ours) CherryPick 35530d from master to mr0. do not merge. * commit 'b0994ed7ffd31d02b9d66a470decfdfaf0d6f8ee': CherryPick 35530d from master to mr0. do not merge.