| commit | 59cdbf00103f3255399216ddbe49fb50fbdcaa53 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Wed Aug 27 04:45:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 27 04:45:58 2014 +0000 |
| tree | aa0af7ada95a67ff59ef99b8862c7b3c835f03ae | |
| parent | 16a476c25f9cbf440d9387dcd44383a194c96a98 [diff] | |
| parent | c240eec9750ff270174f356cd5e5ddfd5314598e [diff] |
am c240eec9: resolved conflicts for merge of 22e6e972 to lmp-ub-dev * commit 'c240eec9750ff270174f356cd5e5ddfd5314598e': Remove manifest-related details for live wallpapers.