tree d3cebd4b3664a189c1db2356bf546827bb5f88bb
parent eac3ad3f83f0d02b23467c05f002cca7d552a9e0
parent 2bb8dde44be10212ec453d435aaad27177714f5e
author Chris Wren <cwren@android.com> 1397157807 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397157807 +0000

am 2bb8dde4: Merge "support the people extra on the notification object"

* commit '2bb8dde44be10212ec453d435aaad27177714f5e':
  support the people extra on the notification object