tree 8a9930838884b02f3668b4d7bed205bc91d6f846
parent dbd9bf6592526422f16c4a343eda6cf2df744003
parent c16e2bd6e6d5ef99c513e79736f513e73f72d0be
author Joe Onorato <joeo@google.com> 1288550507 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1288550507 -0700

Merge "Allow both contentIntent and setOnClickPendingIntent in notifications"