Daniel Lehmann 8d7c910405 am 0d8627be: Merge "Add Contact ID to StreamItem-Fields" ...

* commit '0d8627be88a1ce4ee5c9076f484afb6006e32900':
  Add Contact ID to StreamItem-Fields

2011-08-25 13:24:06 -07:00

..

java

am 0d8627be: Merge "Add Contact ID to StreamItem-Fields"

2011-08-25 13:24:06 -07:00

jni

am cd6ec780: Merge "Revert "Warn only if we\'re tearing down "live" DeathRecipient content""

2011-08-25 13:18:41 -07:00

res

Merge "Updated spinners (again) Bug: 5076695, 5165156"

2011-08-24 22:52:41 -07:00

tests

Merge "Data usage buckets active time, parsing ISE."

2011-08-25 11:13:38 -07:00