tree ad35289ff769950638bcc31b4d2fdbaf7d3eaaf4
parent 072a0fac3cabd50c2089d987b5abceac35c74570
parent b6c15de82a9bf477aab34763c9a4e9d8612c8af1
author Jean-Baptiste Queru <jbq@google.com> 1308421319 -0700
committer Android Code Review <code-review@android.com> 1308421319 -0700

Merge "tweak for forward-compatibility"