| commit | e6cad8027c644b7d4dfc38984fa52732cb7906cd | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Wed Jun 11 12:41:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 11 12:41:45 2014 +0000 |
| tree | 56d74eda8fd341ea77b5c4ff277d86ef01f51959 | |
| parent | 2643de55d3795335323a9ab012fb05f4cfd5a667 [diff] | |
| parent | 598622df8cc2ddf03ef2d47da2564693a10c2de1 [diff] |
am 5eb62efd: Merge "Do not override mColor with default color if none set" into lmp-preview-dev * commit '5eb62efd935399335ee2504a483900c69a45494a': Do not override mColor with default color if none set