tree 860d0e4c79392a6d84b7bb4b57086784a2132257
parent ee794ba5376fbd34dfd9accef0e64a30307edca3
parent 385f87c1ff6e08efc56032ced3fbaee2fc62f964
author Android (Google) Code Review <android-gerrit@google.com> 1251474153 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1251474153 -0700

Merge change 23103 into eclair

* changes:
  Fixing the build.