tree c914b64f97764eb648eeee5373cec5b1df6be853
parent 40f2faadc10f7b4b549dfd32c5bc1c7c2033ca48
parent 39bb698cd255962fb69c99bc5179b9590b6efbb3
author John Reck <jreck@google.com> 1314909963 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1314909963 -0700

Merge "Partial rollback of I9ebc92dc"