diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-11-13 09:36:18 +0100 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-13 09:36:18 +0100 |
| commit | bed011ab78242f8d408d92a47fc3fc6fc281096e (patch) | |
| tree | 9489470329295f5ebe70452b6a5bec3c725d1e42 /src/com/android/settings/profiles | |
| parent | 9897751d02be1f51caeb5a8d9647c1f8ae7a03ff (diff) | |
| download | packages_apps_Settings-bed011ab78242f8d408d92a47fc3fc6fc281096e.zip packages_apps_Settings-bed011ab78242f8d408d92a47fc3fc6fc281096e.tar.gz packages_apps_Settings-bed011ab78242f8d408d92a47fc3fc6fc281096e.tar.bz2 | |
settings: Fix merge collision
Change-Id: I6cfb35e3d2b58a0ea7f79f2d400544d3baec6178
Diffstat (limited to 'src/com/android/settings/profiles')
0 files changed, 0 insertions, 0 deletions