tree 273eb1cb64f5ec036a2e7b8e3ca9669ee41e3221
parent 6b8a02d63a5d9cab8209381993e37db6a6afb753
parent 6c8a5790820dbcb64568fdefc8464a8d971847f0
author Michael Jurka <mikejurka@google.com> 1332497378 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1332497378 -0700

Merge "Minor code cleanup"