tree 1a004e7b12ce9e5bf2c3023e3e282d6c2cbd2373
parent bf046a8e05a3f699ec656a5cf4fde08ffc3fc78d
parent 35302266fa2cadb23e2b5005943b6f63372b7ab8
author Xavier Ducrohet <xav@android.com> 1313616920 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1313616920 -0700

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

* commit '88512f59bc051a42f4dd70acc8af5622f7e99db6':
  Fix String16 operator+ to actually work