diff options
| author | Jeff Davidson <jpd@google.com> | 2014-12-09 15:11:44 -0800 |
|---|---|---|
| committer | Jeff Davidson <jpd@google.com> | 2014-12-09 15:11:44 -0800 |
| commit | 06b65d1c7d5f5c87f8d723b6ab0040f9bfc834c4 (patch) | |
| tree | 36c6482c41b711129bc050dc38d26a331ed982c8 /res/layout/setup_choose_lock_password.xml | |
| parent | 2a321adc9bdf55cecd014b047521219b4bb9cd02 (diff) | |
| parent | 0c7e4ed69799ac7e72b331554a42b321d18b6baf (diff) | |
| download | packages_apps_Settings-06b65d1c7d5f5c87f8d723b6ab0040f9bfc834c4.zip packages_apps_Settings-06b65d1c7d5f5c87f8d723b6ab0040f9bfc834c4.tar.gz packages_apps_Settings-06b65d1c7d5f5c87f8d723b6ab0040f9bfc834c4.tar.bz2 | |
resolve merge conflicts of 0c7e4ed to master.
Change-Id: I6c5625564f69769eb6f61d3df7531f032080d0d9
Diffstat (limited to 'res/layout/setup_choose_lock_password.xml')
0 files changed, 0 insertions, 0 deletions