tree ae4040d6882777ee4e289ed101c5d54fd006af15
parent 3d7790edf468a8b9669f30cca6863c4c0d31aa17
parent 32fb9fed1ed954beb8fcadff9d09e0e1374fb145
author Jeffrey Brown <jeffbrown@android.com> 1360213194 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360213194 -0800

am 32fb9fed: am 1b9a6057: am 44508515: Merge "Tidy up long lines"

# By Duane Sand
# Via Android Git Automerger (2) and others
* commit '32fb9fed1ed954beb8fcadff9d09e0e1374fb145':
  Tidy up long lines