tree 1de9c8366d7aa93badd0bc264774ab0aa1899559
parent bb43828aa749e71d4e52ba69db01b83c83a755b5
parent d9af22e204e7f4c364c346b6c1bac900a2c4ccca
author Xavier Ducrohet <xav@android.com> 1305925007 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1305925007 -0700

Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread