tree f2af83b9f927c20152351c755793c187e0db167d
parent 839ca0d5fa3b22e1e27aa8110d665aa6b6b91e26
parent b12318be13be00842d124e4391ce5eabce2d5104
author Alan Lau <alanlau@google.com> 1406742423 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406742423 +0000

am b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev

* commit 'b12318be13be00842d124e4391ce5eabce2d5104':
  Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""