diff options
| author | repo sync <lockwood@android.com> | 2009-11-18 17:55:09 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-18 17:55:09 -0800 |
| commit | c1786f1697b3376585f1e59585b84781c9811f10 (patch) | |
| tree | 9aa20293558ed7e2722b00fc92bb2271a9ded9b4 /docs/html/guide/guide_toc.cs | |
| parent | f4d7ffb0b120b000e7e3489e253f1493a8ea1e18 (diff) | |
| parent | d28fcd5bb8e5734a12b83f7cefde759c009e7b6e (diff) | |
am d28fcd5b: resolved conflicts for merge of efd91d7c to eclair-mr2-plus-aosp
Merge commit 'd28fcd5bb8e5734a12b83f7cefde759c009e7b6e'
* commit 'd28fcd5bb8e5734a12b83f7cefde759c009e7b6e':
Fixes for proximity sensor behavior:
Diffstat (limited to 'docs/html/guide/guide_toc.cs')
0 files changed, 0 insertions, 0 deletions