am 299d25e0: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev

Browse Source

* commit '299d25e07b1ff58a7e90f9b46cd916ce337ca4ee':

...

This commit is contained in:

Qiwen Zhao 2013-12-10 01:58:25 +00:00 committed by Android Git Automerger

parent a0a8bb060c 299d25e07b

commit 5273f557de

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