| commit | 8b1c27c5abd569664566ccdb84f772aeaa962ddd | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Wed Mar 18 23:51:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 18 23:51:02 2015 +0000 |
| tree | d28385213974f34b943f6fa3433add971ed9af36 | |
| parent | 27f2fe5c1a0339207fc031ea8a1a6ee13d37bc65 [diff] | |
| parent | f5353e9dda15fe49023083ec7ca2131feed7787d [diff] |
am f5353e9d: am 91281bbd: resolved conflicts for merge of cc86bc0c to lmp-mr1-modular-dev * commit 'f5353e9dda15fe49023083ec7ca2131feed7787d': Prevent activities from being started during setup wizard.