| commit | 2080734362f7b6e361e9dff825464ccf56b492f6 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Sep 22 23:39:47 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 22 23:39:47 2011 -0700 |
| tree | 24d8d35a20dbd53425788c5409b6c42b44885d3c | |
| parent | 8fbf284cc83263a6b5ce37afe9a14e8f06d8c317 [diff] | |
| parent | 3a1eb8fc1c389585c18526b03cf6fa153fb9391f [diff] |
am 3a1eb8fc: (-s ours) Cherry-pick 7fb4cc from master. do not merge. * commit '3a1eb8fc1c389585c18526b03cf6fa153fb9391f': Cherry-pick 7fb4cc from master. do not merge.