tree eeed4a8e3675fa29c51eec93343806e0df9f77c6
parent 6a6850f15ab91dab6a019be15bd1adf6de6e4ccc
parent 6b47c42ee5debe32a41c037f610e14d897bdf90f
author Scott Main <smain@google.com> 1330971135 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330971135 -0800

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

* commit '79003f35945fbbb0c55c23e8fd33085c4f129423':