tree 6d6969c4ea969dc7d8f4e33c17c689a454ea953a
parent 6674ec30bb92337e3bccb67bca53555a798a493f
parent 85f351d1f925b265c401f1992b57dc028d462453
author Jean-Baptiste Queru <jbq@google.com> 1284580602 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284580602 -0700

am 85f351d1: Merge "Allow devices without AndroidBoard.mk" into gingerbread

Merge commit '85f351d1f925b265c401f1992b57dc028d462453' into gingerbread-plus-aosp

* commit '85f351d1f925b265c401f1992b57dc028d462453':
  Allow devices without AndroidBoard.mk