Resolves conflicts for merge of 1cb45399 to lmp-mr1-dev

Browse Source

Conflicts:
	src/com/android/settings/CryptKeeper.java

Change-Id: I3d16d6b571e9c493df23cb6cedd7e9ed929a43da

...

This commit is contained in:

Paul Crowley

2014-11-20 10:16:50 +00:00

parent 5925e1912e 1cb45399d3

commit 67b4af148d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available