tree 285ba6c6f11cfc0d1bf7781b7a0291a067a205ef
parent 7094bf3a5e9d1983d6877f580506d93fd736c437
parent fdb13fccfecdf526549ad453a20e8136253edb51
author David 'Digit' Turner <digit@google.com> 1316757677 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316757677 -0700

am fdb13fcc: am 0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread

* commit 'fdb13fccfecdf526549ad453a20e8136253edb51':
  sdk: Fix broken google_sdk and google_sdk_x86 add-on build.