tree 6dd127a4be7fa5645dd652246d4838f20b3365cd
parent 9d1296898a93293e64529d548189bfc8185ffd08
parent 815d8b8fdbd86bb2f7e5f11dc9ace9cb62212d59
author Android (Google) Code Review <android-gerrit@google.com> 1250645242 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1250645242 -0700

Merge change 21845 into eclair

* changes:
  Allow redefinition of macros.