tree 2b2ca6328f6ec733bfa8031e54565f2b60e1b66f
parent c65d4c107f7c9bab731b198281109e576c2f6956
parent 78e6622fbb2bacdac68269b60cc694275ae132a4
author Scott Main <smain@google.com> 1276803741 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276803741 -0700

am 78e6622f: am 821ca518: docs: edits to resources doc

Merge commit '78e6622fbb2bacdac68269b60cc694275ae132a4' into gingerbread-plus-aosp

* commit '78e6622fbb2bacdac68269b60cc694275ae132a4':
  docs: edits to resources doc