commit | 02aa00d00d4d5ab51e67bf4b584bb9dcb049eefd | [log] [tgz] |
---|---|---|
author | Dan Sandler <dsandler@android.com> | Wed Oct 29 07:06:29 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:06:29 2014 +0000 |
tree | 10da860fcff71886af91d082e31f0e1917926848 | |
parent | f0fe8bb2b32e7414749b3ffbc3988e2e20628308 [diff] | |
parent | 7e23ffebe926a1818e6fae9a4cf4bb047309c099 [diff] |
am 7e23ffeb: am 351453a1: am 0572c310: am b4ee5792: am b3084e87: Merge "Revert "Revert "Enable Launcher2 workspace import.""" into jb-ub-now-jolly-elf * commit '7e23ffebe926a1818e6fae9a4cf4bb047309c099':