OSDN Git Service

am 4653cb89: cpufeatures license is BSD, no Apache 2.0
authorDavid 'Digit' Turner <digit@google.com>
Tue, 23 Feb 2010 00:35:29 +0000 (16:35 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 23 Feb 2010 00:35:29 +0000 (16:35 -0800)
Merge commit '4653cb897b8f52c1ead12a1bffa1ba40fd8f45a2' into eclair-plus-aosp

* commit '4653cb897b8f52c1ead12a1bffa1ba40fd8f45a2':
  cpufeatures license is BSD, no Apache 2.0


Trivial merge