tree 2d05bf8f490ca26d7c272e7393ca96ac0495e367
parent 720ec5efca302e63b78a6dafaebe97c3abba456a
parent 7b14e7c051eabf2f9b3e2f8035d8330a4924d930
author David 'Digit' Turner <digit@android.com> 1301498485 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301498485 -0700

am 7b14e7c0: am a5d35801: am 50dd0170: Merge "Fix linux sdk build."

* commit '7b14e7c051eabf2f9b3e2f8035d8330a4924d930':
  Fix linux sdk build.