am 06ba3ef1: (-s ours) am 551a1c24: reset to klp-dev branch to fix merging problem.

Browse Source

* commit '06ba3ef19fba91dcb9071cadc4b4bd4d0b454366':

main

Qiwen Zhao 2013-10-04 12:57:05 -07:00 committed by Android Git Automerger

parent 6594318e7d 06ba3ef19f

commit 791a5a6a3c

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

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

Diff Content Not Available