am 18ad0562: am 8912e833: am 218ab2a2: am db6feecd: am c7f2031d: am 1784791c: am 82e3ea95: am e7de0ce7: am 5ffa5bf3: Merge "Keep SetupActivity alive to check re-launching from launcher"
* commit '18ad05625f5d6c0c41df638d9c3f82b9aae3f7d9':main
commit
506666385e