tree 7d882a982ef974e6e098e6cad1144227459cca3a
parent c9514d2dadbedc6ac1023dd1072f18a2ace7cf9b
parent 242915f3d017582186eeebd8bd341a4290e31ff8
author Xavier Ducrohet <xav@android.com> 1313617095 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1313617095 -0700

am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"

* commit '5dcda1fda53bdc6dfe80cf37e62cacdc216224b1':
  Fix String16 operator+ to actually work