tree 6be97023e8f98f4051226c735a471063318e2356
parent 358049b75f7af1862dfae9d4ec48dde542ae5cb2
parent 4842ed029c5861b1696a9c69caa45f9a6e6e5f7e
author Michael Jurka <mikejurka@google.com> 1310146734 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1310146734 -0700

Merge "Moving a bit of code around"