| commit | 209af6013a04da558cb24fcf7cfb0f4f4e1bce34 | [log] [tgz] |
|---|---|---|
| author | mindyp <mindyp@google.com> | Fri Dec 14 16:52:44 2012 -0800 |
| committer | mindyp <mindyp@google.com> | Fri Dec 14 16:55:46 2012 -0800 |
| tree | e6c5d0f9ff8738e502ffae31c82a6b90420a289c | |
| parent | f30a42800318f6790d55421f8f6980eb38db4d3c [diff] | |
| parent | 093ecdd3cde3e54df3fb30f5ca47067fdcf46f3c [diff] |
Merge commit 'f54b3505' into manualmerge Conflicts: chips/src/com/android/ex/chips/RecipientEditTextView.java Change-Id: I2a8d55d6db3fdb4aab6ea788b685a047dcf9ed9d
