tree 6002adddf67c3ac92793e2cd797b44fe653d9b88
parent 03b100e11dad5bef34e71ccfd45b6c7adc9bfee4
parent 43582423ee64b4d1e8f0186e34494cc7f7519488
author David Friedman <dmail@google.com> 1414606819 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414606819 +0000

am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release.

* commit '43582423ee64b4d1e8f0186e34494cc7f7519488':
  Fixes linebreaks that had gotten altered during the run-up to 5.0 release.