tree a93ccabe3d911488b355220d40fc1c8b043f19e0
parent 70ac092d86ed31241bd9d7a7d053dc2e1336a2a3
parent 4ad24ba3c726bb9021d887c4c2300d345151ab0d
author Michael Jurka <mikejurka@google.com> 1295312820 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1295312820 -0800

Merge "removed some more unnecessary code" into honeycomb