resolved conflicts for merge of fae59e8a to klp-dev-plus-aosp

Browse Source

Change-Id: Iaf15aa6c9087eb0e72661b40acbf74830df0b00c

...

This commit is contained in:

Scott Main

2013-11-05 15:28:56 -08:00

parent b4a601467c fae59e8ae1

commit 16560f1e14

1 changed files with 2 additions and 2 deletions

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