diff options
| author | Bart Sears <bsears@google.com> | 2015-03-18 22:53:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-18 22:53:22 +0000 |
| commit | f5353e9dda15fe49023083ec7ca2131feed7787d (patch) | |
| tree | 96faf14c40bb28430fee9f6747f98fb07a1dcb50 /core/java/android | |
| parent | b078ff16a3ea83f7e4f444eb7b7b699ee8e913a6 (diff) | |
| parent | 91281bbdde1d8bcec993ff61044a5aa4897f3175 (diff) | |
| download | frameworks_base-f5353e9dda15fe49023083ec7ca2131feed7787d.zip frameworks_base-f5353e9dda15fe49023083ec7ca2131feed7787d.tar.gz frameworks_base-f5353e9dda15fe49023083ec7ca2131feed7787d.tar.bz2 | |
am 91281bbd: resolved conflicts for merge of cc86bc0c to lmp-mr1-modular-dev
* commit '91281bbdde1d8bcec993ff61044a5aa4897f3175':
Prevent activities from being started during setup wizard.
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions