OSDN Git Service

am 528c8fa1: am 4653cb89: cpufeatures license is BSD, no Apache 2.0
authorDavid 'Digit' Turner <digit@google.com>
Tue, 23 Feb 2010 00:43:26 +0000 (16:43 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 23 Feb 2010 00:43:26 +0000 (16:43 -0800)
Merge commit '528c8fa1827b36c19ff92655bb40012415761193'

* commit '528c8fa1827b36c19ff92655bb40012415761193':
  cpufeatures license is BSD, no Apache 2.0


Trivial merge