am 16560f1e: resolved conflicts for merge of fae59e8a to klp-dev-plus-aosp

Browse Source

* commit '16560f1e146c854bb006e22601dbcf6eac798167':

...

This commit is contained in:

Scott Main

2013-11-05 15:35:13 -08:00

committed by Android Git Automerger

parent a870f691ab 16560f1e14

commit b6a83cef3d

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