tree 014af4e927fc7223f675e04a8f3cc2258e563797
parent abe998c5e0550f37d27f9c03dbaf56cc07a03dcb
parent 2a87c9da129d23930a4e5fc7c7a34d933129840d
author Scott Main <smain@google.com> 1355427614 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355427614 -0800

am 2a87c9da: am c49ffcde: am f83ab33c: am 095d6947: docs: explain that layout height/width must be used to override include layouts

* commit '2a87c9da129d23930a4e5fc7c7a34d933129840d':
  docs: explain that layout height/width must be used to override include layouts