tree 7ff83b6b678a574104ec9f51cf015aa1539d5783
parent 9a6c8168f743c1dc8cc28de22fe12be4623434cd
parent e4c2a37624612c9708d0767f8643a10502e6887a
author Scott Main <smain@google.com> 1261254780 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1261254780 -0800

am e4c2a376: Merge change I2703edac into eclair

Merge commit 'e4c2a37624612c9708d0767f8643a10502e6887a' into eclair-plus-aosp

* commit 'e4c2a37624612c9708d0767f8643a10502e6887a':
  docs: add new device features for the uses-feature