tree b46c0d6b80fdfc84f8359eea68ae03f278f37985
parent 83a0e0491cce24da18dcfadd4e83e6502459b34c
parent 24a9b0832326155b819da2b7cbbd333a86ba846e
author John Reck <jreck@google.com> 1314909963 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1314909963 -0700

Merge "Partial rollback of I9ebc92dc"