| commit | e7de0ce7411faec1b9bcfc07bdffe5c59856d928 | [log] [tgz] |
|---|---|---|
| author | Tadashi G. Takaoka <takaoka@google.com> | Thu May 09 23:26:24 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 09 23:26:24 2013 -0700 |
| tree | 090bfb07af8394e7932214d09c7b9f9f614c4806 | |
| parent | 07905b6a0a3e67ffc5a803ddbe863c2c101846fe [diff] | |
| parent | 5ffa5bf3ba7d169912d163790e461ab8d5aca30a [diff] |
am 5ffa5bf3: Merge "Keep SetupActivity alive to check re-launching from launcher" * commit '5ffa5bf3ba7d169912d163790e461ab8d5aca30a': Keep SetupActivity alive to check re-launching from launcher