tree 716ef087ac59b90cff170eb97f989198a904a5a9
parent 07b072ad2f2e1e6a56e03e3891686762d9a972a7
parent 486d70d27a26186ffef19e4e2c0536521df275af
author Jean-Baptiste Queru <jbq@google.com> 1283969002 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1283969002 -0700

Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp