tree ac233896b1a724454e64bce568c9597fc80cc888
parent 709f140bea3974a30c68e99f507563854acad1dd
parent 5652935aef0a1a9ecb6eef5550eb0e6a52999135
author kmccormick <kmccormick@google.com> 1364516846 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364516846 -0700

am 5652935a: am 5a5ff0b8: am 6754e05b: am c1fbc91b: am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs

* commit '5652935aef0a1a9ecb6eef5550eb0e6a52999135':
  Doc update: fix broken XML causing prob in View