| commit | 18bc55d173000f05b10fd547fd67522abfa95523 | [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 | 1a3c3291a31e54d01de2859b335e4d22b6e6ab9a | |
| parent | f5ac32862370c6dd004baa0ac838bced8794a0d8 [diff] | |
| parent | 99ea997e237f6941bed7bdfbc221ad78643650c5 [diff] |
Merge remote-tracking branch 'goog/jb-ub-mail' into gmailmerge Conflicts: chips/src/com/android/ex/chips/RecipientEditTextView.java Change-Id: I160582b77ead921df187bdcf41a1f53cd0d5e425