tree 8f055b251ba86ddd7aada7b5de95f9c4145b555e
parent 647aa5f1f229947d982548f698c4533fe538f884
author Marc Blank <mblank@google.com> 1253238333 -0700
committer Marc Blank <mblank@google.com> 1253239088 -0700

Revert very bad commit (strange merge problem)?

* This reverts commit 3f224e7efe1cf8a816c6de4f5dd5eaf8a5f00d1b.
* Use StructuredName.DISPLAY_NAME for Email display name on upload

Change-Id: Ic11713773d0e5b0db452dce3c9c31680ca45dbf5