tree 27a8a9922ec85e80ac8abd7dc119625594e81a13
parent 06fac4f77bd63909098914385be01d929a2336e8
parent 0ca3829d4c36c96099cd1d008036c252daf90b8e
author Roozbeh Pournader <roozbeh@google.com> 1464320087 +0000
committer android-build-merger <android-build-merger@google.com> 1464320087 +0000

Merge "Ellipsize Preference summaries" into nyc-dev
am: 0ca3829d4c

* commit '0ca3829d4c36c96099cd1d008036c252daf90b8e':
  Ellipsize Preference summaries

Change-Id: I2a787ec44b833cf03a9069b99bc79da957c562b2