tree 90732280e90091eec13804ecd726854890c9937d
parent b18460ef5b0e8a62e359960595c4e82b1e1500e5
parent 2e3b9d30d4e16ecc0b3e4a04252b23afe55dda8c
author Robert Ly <robertly@google.com> 1404260854 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404260854 +0000

am 2e3b9d30: am 9b3bfb10: docs: updated expandedtext_combo

* commit '2e3b9d30d4e16ecc0b3e4a04252b23afe55dda8c':
  docs: updated expandedtext_combo