| commit | 58ff57f0f7d2ca9527b64c62e147d06f01309bef | [log] [tgz] |
|---|---|---|
| author | Paul Westbrook <pwestbro@google.com> | Mon Nov 19 17:28:08 2012 -0800 |
| committer | Paul Westbrook <pwestbro@google.com> | Mon Nov 19 17:28:08 2012 -0800 |
| tree | 03d474560adaa6871dc4ea83f0ef41b3414c15ab | |
| parent | 4491a0679fbf4472f9bc199197c1d4abe6a9d969 [diff] | |
| parent | cb76b4d2bcb7b72b9505a620ca71f753506e48b9 [diff] |
Merge remote-tracking branch 'goog/jb-ub-mail' into gmailmerge Conflicts: chips/src/com/android/ex/chips/RecipientEditTextView.java Change-Id: I160582b77ead921df187bdcf41a1f53cd0d5e425
