OSDN Git Service

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


Trivial merge