tree 3ea10cd16b1a270fa6b7bee1a090e0ef7a6d432c
parent 169ef4cca30c77a1a85c9684560c504a5ac230b5
parent 63d524fdf0572c821bb1daed099d1b400db4ae3d
author Android (Google) Code Review <android-gerrit@google.com> 1255972805 -0400
committer Android (Google) Code Review <android-gerrit@google.com> 1255972805 -0400

Merge change I63d524fd into eclair-mr2

* changes:
  Fixing the build by renaming private "string.h" header file.