tree 4ee021c71970639a10324df25fce26a618bbbd30
parent e2c45c146beb4456dd48c45f121c5e375966b6a4
parent a714c73fcf57baa103330a1bf0e09739f6d571df
author Jean-Baptiste Queru <jbq@google.com> 1342806319 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342806319 -0700

am a714c73f: am ba360acf: Reconcile with AOSP

* commit 'a714c73fcf57baa103330a1bf0e09739f6d571df':
  Strip board-info.txt for AOSP