tree dcdec15a9df0754200628c5d46a07dfed24101a8
parent d14174a56c6099f32adbfa11a2fdba4580c7ff96
parent de8b6a5d99da277edf17b741805cc2992f940ab9
author Jean-Baptiste Queru <jbq@google.com> 1342801056 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342801056 -0700

am de8b6a5d: Reconcile with AOSP

* commit 'de8b6a5d99da277edf17b741805cc2992f940ab9':
  Update board-info.txt