tree e322e5740941cb092c1291b54ec648b4e1785eb3
parent bf71a84273e636961c197ac9ab615f9500b68f59
parent a3b837c0814c750e7b19e5965eabd23eab78207a
author Manuel Roman <manuelroman@google.com> 1281405465 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1281405465 -0700

Merge "Incorporated Joe's comments"