tree 6b05f842fe428e3f37fb49ba66377083ff4aec24
parent 1e9127b3e915ef772fcabf76e4e394b5e587e363
parent bc9c061909b89893d98b0c1f7cd9fa4971279b20
author Jean-Baptiste Queru <jbq@google.com> 1342805687 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342805687 -0700

am bc9c0619: am de8b6a5d: Reconcile with AOSP

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