| commit | 7e23ffebe926a1818e6fae9a4cf4bb047309c099 | [log] [tgz] |
|---|---|---|
| author | Dan Sandler <dsandler@android.com> | Thu Oct 23 17:31:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:31:58 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | 77540341dc893157e01a64e4063c21a19309dec7 [diff] | |
| parent | 351453a18755e24abf1906e6fec469e8691baba1 [diff] |
am 351453a1: am 0572c310: am b4ee5792: am b3084e87: Merge "Revert "Revert "Enable Launcher2 workspace import.""" into jb-ub-now-jolly-elf * commit '351453a18755e24abf1906e6fec469e8691baba1':