tree 2edd4187a1aef177b9093f21794926049d55837a
parent ac19268a36d583df2d7ac763b9e3fc6ec6da40cc
parent 214835773f7a11c9262ee1f612a8b2792ea72ea2
author Eric Laurent <elaurent@google.com> 1291049632 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1291049632 -0800

Merge "Revert "Temporary workaround for issue 3187563""