am 5ee4f94a: (-s ours) am e53461a8: am 129a87f9: am 6b0409db: (-s ours) am 92be9d34: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '5ee4f94a5a4edfd18a69fbdc89786caec4cf3371':
am 4aa10b1b: Merge remote-tracking branch \'goog/jb-ub-mail-ur9\' into merge

* commit '4aa10b1bc14290397756b05e97ff9bc8a3b7564b':
  Refactor some of thie chips code
  Add a test case for b/8321211
  Fix a failing test
  Initial clean up of the chips code
  Unit test for getBetterRecipient()
  Remove waitForDebugger()
  Fix the chips tests so they build
  Revert an unnecessary change
  Ensure appended emails have a comma separator
  Don't jump focus out of the View when the Activity starts
  Prevent the tab key from double-tabbing
am 5727eeeb: resolved conflicts for merge of 35d3af70 to jb-mr2-dev

* commit '5727eeebd6f7afc15b773dd851a121f51a4ccd75':
  Fix a Dead Loop issue in RecipientEditTextView
am e35b1406: am e46cb66d: Always close this cursor

* commit 'e35b1406916bef5623cead8c02e6d8466bb6e968':
  Always close this cursor
am b3884208: am 8b7e1e57: Cherry-pick Fix a Dead Loop issue in RecipientEditTextView

* commit 'b38842089f6d901150f8a77e778eca5159d4c5b5':
  Cherry-pick Fix a Dead Loop issue in RecipientEditTextView
am 0ee09dfc: ArrayIndexOutOfBoundsException in RecipientEntry.constructFakeEntry

* commit '0ee09dfc02251a6932c3787400ce6e188e72ca23':
  ArrayIndexOutOfBoundsException in RecipientEntry.constructFakeEntry
am 0175956f: am 52dba50b: ArrayIndexOutOfBoundsException in RecipientEntry.constructFakeEntry

* commit '0175956f49bb05f18e303c59b86a5224d7c9c294':
  ArrayIndexOutOfBoundsException in RecipientEntry.constructFakeEntry
am 6413ac66: Area code gets eaten in Chips

* commit '6413ac6689b3d33cf2e42715575d3119d2c90f00':
  Area code gets eaten in Chips
am b560197a: am f9171bb3: Cherry-pick: Area code gets eaten in Chips

* commit 'b560197a9d2f056545e54cd4746b8ce6dde9c629':
  Cherry-pick: Area code gets eaten in Chips
am 8f0f70c8: am f5ecf6ad: Add unit test for creating fake phone entries

* commit '8f0f70c88a16f784deddfc1511503226b17798ca':
  Add unit test for creating fake phone entries
am 4fc5c95c: StringIndexOutOfBoundsException in Chips during monkey run

* commit '4fc5c95c966615b971a8d67dc63b384ae691fb11':
  StringIndexOutOfBoundsException in Chips during monkey run
am c3a17c96: am da491f04: Prevent a potential ANR

* commit 'c3a17c96b86bff4e387c361127e04d60173a9ca6':
  Prevent a potential ANR
am e0502615: (-s ours) am 680a9d72: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit 'e050261533ed4fff1c86a0553a5858e22d0305a9':
  Import translations. DO NOT MERGE
am 06e1da6c: (-s ours) am 79361f84: (-s ours) am a97c5fbb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '06e1da6cb8e53c0c4dc9267bdbaba3ea9c0d7c32':
am 81dc10b4: am 8f1f5423: am f64cbf19: Don\'t show duplicate destinations in alternate popup

* commit '81dc10b475b53aae8040da532dd1b667cbc3e06f':
am a4f33daf: am 525ec743: am 593f0b4e: Fix alternate reverse lookup query.

* commit 'a4f33dafe61e89c5753758f36d237f60d126343c':
am 4ebfe2d3: am b7719c17: am 5ba77015: Merge "Don\'t autoselect first item in dropdown" into jb-dev

* commit '4ebfe2d3c0f930878ee5c7823316c58f8b5a2620':
am 0719fbb2: am 32bfa893: am ab2c5069: Contact added to the "To" field of the Messaging app is not getting deleted

* commit '0719fbb2cbf56bf9a219be6e2e47ed29bde35186':
am 327b11ab: am 7e12aaa7: am dd5c5cf8: Use ALIGN_BOTTOM instead of ALIGN_BASELINE

* commit '327b11abdb95a185b0e39d48a9a315a615d962a1':
am 0ac1c774: am f30ffd13: am 1896ac00: Change text on "done" to say "return"

* commit '0ac1c7749b1d67667da77381c24c0d78ffc26855':