tree 0109c9bda4395c5384ceb330b078a9e6cf846c46
parent f58635425b633a010c70ca2c1947d2282a0ee668
parent 4c3b1296c17cce016d5462c1cc47c006708b8d97
author Treehugger Robot <treehugger-gerrit@google.com> 1511210680 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1511210680 +0000

Merge changes Ifb41457a,Ia890ad20

* changes:
  Use correct field type for annotation definition.
  Search now supports alternative sort and display orders for contact names.