tree 5a442df9219374c384a931f0c481f15f8b0dc354
parent 18cd97931c60f7595d7d5d4cdfd4344dde20153f
parent 06706ba5d66d5c5d937750868be0eecb8ed9b43b
author Scott Main <smain@google.com> 1362517395 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362517395 -0800

am 06706ba5: am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480

* commit '06706ba5d66d5c5d937750868be0eecb8ed9b43b':