tree a97ade1c00a5eac20a97d59a1442ae2655b04bad
parent dc022a6f9aa30d9282c4f82c1cc4d1c8bde7e808
parent bde31762f989acbfde92e8f47ceea780cacc4e7a
author Scott Main <smain@google.com> 1330970934 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330970934 -0800

am bde31762: am 93dc642e: docs: fix misc bugs from external tracker

* commit 'bde31762f989acbfde92e8f47ceea780cacc4e7a':