tree a298995a015476dc711bb2aa6287775665e02d2c
parent 1a7df62c0122fd5a98cb55bfa08c50da413ad69e
parent 46c9ed26218838c50ea4e29d786723ef16c52a4c
author Jean-Baptiste Queru <jbq@google.com> 1284067370 -0700
committer Android Code Review <code-review@android.com> 1284067370 -0700

Merge "  Initial contribution from Sony Corporation."