OSDN Git Service

am 4888fe34: resolved conflicts for merge of cece45d2 to klp-modular-dev-plus-aosp
authorBrian Carlstrom <bdc@google.com>
Tue, 1 Apr 2014 19:30:43 +0000 (19:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Apr 2014 19:30:43 +0000 (19:30 +0000)
* commit '4888fe345306cd747b03757a01089683a2e6c922':
  cortex-a7 supports div


Trivial merge