| commit | e17b81ae7472f4f557c2158e5160e808a7354fe0 | [log] [tgz] |
|---|---|---|
| author | Walter Jang <wjang@google.com> | Thu Aug 27 11:23:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:23:49 2015 +0000 |
| tree | 05121f2cf4de9162fb4184ebe1989f4d3c05ca35 | |
| parent | c43df7b50fb2478a5149e4068d7dabcc7c776dab [diff] | |
| parent | c5a24c38acfe7243f296622f781a8115ce49bd77 [diff] |
am c5a24c38: (-s ours) am 03debc68: Pass MaterialPalete colors to contact editor as ints not Parcelable * commit 'c5a24c38acfe7243f296622f781a8115ce49bd77':