| commit | 4894346811e73e986d4dcb6abe09df811ee49d44 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Thu Jun 18 21:40:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 18 21:40:13 2015 +0000 |
| tree | e4ff6072472fdf5fdc7615547076d06a50db0aa7 | |
| parent | ac9d7b403bfa49db11cdb8a75c7c54958d78279b [diff] | |
| parent | 7b933a5ef764d4716177dc7f060af823a38fa628 [diff] |
am 7b933a5e: resolved conflicts for merge of 78564d4e to ub-launcher3-burnaby * commit '7b933a5ef764d4716177dc7f060af823a38fa628': Updating ComponentKey for compatibility with build.