commit | 7118ea707b754ae18a65577e1d8fd5836c662c29 | [log] [tgz] |
---|---|---|
author | Raphael <raphael@google.com> | Fri Oct 28 18:54:36 2011 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 28 18:54:36 2011 +0000 |
tree | 1c2aee418bc78773aff239d56f29b6c3cfdfb30e | |
parent | ff05f3f03da8f97f8dd3169255e9ed85b961828b [diff] | |
parent | a2904e6a57d5c685ae62bce0d84674d172482aac [diff] |
am fe9a2a54: (-s ours) Cherry-pick f51125d from master to ics-mr0. do not merge. * commit 'fe9a2a5471616a3267b30013bce36b13a455c0cd': Cherry-pick f51125d from master to ics-mr0. do not merge.