tree 382061ba05c6c42c4872f431845f6820b67d3b9b
parent 02457b82bbc254fcea7c93146258bb8351bc3b66
parent 645c606353b44c46216fdb5d8b9d8d5269f1c191
author Trevor Johns <trevorjohns@google.com> 1374795473 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1374795473 -0700

am 645c6063: am c73e813f: am e83a81e1: Merge "BasicContactables: Fix lines >100 cols" into jb-mr2-dev

* commit '645c606353b44c46216fdb5d8b9d8d5269f1c191':
  BasicContactables: Fix lines >100 cols