tree 424815afa4d926475ea6963db97ad97c9a080184
parent 9e44c4f19821acf3022ca87d5c36f5f79cfad539
parent dbb872157bfb520de0482b05b099e44e471925a5
author Android (Google) Code Review <android-gerrit@google.com> 1248114879 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1248114879 -0700

Merge change 7784

* changes:
  Remove redundant defines, these were only necessary while changes were being staged to another repo