| commit | e37f6aacf40a3476a7b9901788142c2b8000bf24 | [log] [tgz] |
|---|---|---|
| author | Chris Banes <chrisbanes@google.com> | Thu Jun 12 20:05:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 12 20:05:43 2014 +0000 |
| tree | 9d5419d327273a3eaad2888a7e7f43619cafba86 | |
| parent | cf4ea785a7566518c26cb78cf04bd5ee53fe9c1d [diff] | |
| parent | e6174a6e974ba01e17c9f7b1037a5fe389b0243a [diff] |
am e6174a6e: (-s ours) Merge "DO NOT MERGE Add android-support-v7-palette to build" into lmp-preview-dev * commit 'e6174a6e974ba01e17c9f7b1037a5fe389b0243a': DO NOT MERGE Add android-support-v7-palette to build