tree 12f5a24dab933af6d288d0c1d966280118283856
parent 01e8f1a88f30e14f52e356c21492c4a9e3142c31
parent 55b5b79a599dfd0bb85295309504f3e5613817fa
author Jean-Baptiste Queru <jbq@google.com> 1308421642 -0700
committer Android Code Review <code-review@android.com> 1308421642 -0700

Merge "Restore code that was removed too aggressively"