commit | 37f65738cec4cf3c3ed0b5e3d26b483bc5252952 | [log] [tgz] |
---|---|---|
author | Mindy Pereira <mindyp@google.com> | Tue Oct 11 15:39:33 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 11 15:39:33 2011 -0700 |
tree | debdaa14e070230e2699529fdab0bd25cd084e93 | |
parent | c6f163c2b5a2da5b808c8cbf87c11d891bce9d25 [diff] | |
parent | 218e3b5e4864f17a2ac6ee614a2117e915b4a861 [diff] |
am ed358600: (-s ours) DO NOT MERGE. Use settext to instead of clearing. * commit 'ed35860055b334d313d7b454892610891f5b7fce': DO NOT MERGE. Use settext to instead of clearing.