[automerger skipped] Merge "Revert "Add a null home activity to Shell.apk"" am: fa8eb3f146 am: 2aabf5f792 -s ours
am skip reason: Change-Id I927b7dae779da25589f2198e0480c0f2a788a7e4 with SHA-1 539298c1b9 is in history
Change-Id: I0dd072967f37835146a9e4199837946a36cb60b1
This commit is contained in: