am fd1a7a32: (-s ours) am 2008b38a: am e30c8885: (-s ours) am 791a5a6a: am 06ba3ef1: (-s ours) am 551a1c24: reset to klp-dev branch to fix merging problem.

Browse source

* commit 'fd1a7a324256093374bc7b348506924c73b058c4':

...

This commit is contained in:

Qiwen Zhao 2013-10-10 08:22:13 -07:00 committed by Android Git Automerger

parent 7e6ac9d727 fd1a7a3242

commit 8ee5d38a90

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 is not available