tree 6b0087fde214c7859b2bbccf599eb130d1eb90c8
parent f54e2bb77db931d61c985b02e9f451ebea4cb988
parent 064e70f7caa3c948c47e85dfb945530394242c58
author Dan Albert <danalbert@google.com> 1456384356 +0000
committer android-build-merger <android-build-merger@google.com> 1456384356 +0000

Merge "Replace splitlines() with something more tolerant."
am: 064e70f7ca

* commit '064e70f7caa3c948c47e85dfb945530394242c58':
  Replace splitlines() with something more tolerant.