tree b23d80141f6415164db43b1afe36d50f5926dc2d
parent 28d51a39a1bed35855b0fe75a65ad4a6d43a4460
parent b1f56430d38f9d6bab0a3512905daaf994ba134b
author Yohei Yukawa <yukawa@google.com> 1414808342 +0000
committer android-build-merger <android-build-merger@google.com> 1414808342 +0000

am 22cbf54c: Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev
automerge: b1f5643

* commit 'b1f56430d38f9d6bab0a3512905daaf994ba134b':
  Conditionally allow non-primay profiles to use TextServices