tree a6448bf02c2df0177aad85b003b320a8ebec71aa
parent 13fc31df3cdf441b2034c4526ce45f730d80777a
parent 0791c612b9dff787fa5e081d6bb207116333b21a
author Andrew Solovay <asolovay@google.com> 1405517333 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405517333 +0000

am 0791c612: am 3f8d9c9e: Merge "docs: Replaced deprecated fill_parent with match_parent." into klp-modular-docs

* commit '0791c612b9dff787fa5e081d6bb207116333b21a':
  docs: Replaced deprecated fill_parent with match_parent.