am 4888fe34: resolved conflicts for merge of cece45d2 to klp-modular-dev-plus-aosp

Browse Source

* commit '4888fe345306cd747b03757a01089683a2e6c922':
  cortex-a7 supports div

...

This commit is contained in:

Brian Carlstrom 2014-04-01 19:30:43 +00:00 committed by Android Git Automerger

parent 3415c72d7c 4888fe3453

commit 4d864206ea

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