tree 72e8236224e4c584170e48e2cf2976c6a3d7e731
parent 3cbc666362fb25aaccf25c7c1a8f1d06ec1ac1b9
parent 653726a40ae4ed0b54c32262dbc7bb86fd22c6ad
author Android (Google) Code Review <android-gerrit@google.com> 1244010015 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1244010015 -0700

Merge change 3004 into donut

* changes:
  fix the SDK build for real this time. the missing macros weren't declared in the proper order last time.