Christopher Lane 111db01a26 resolved conflicts for merge of 381ac080 to master ...

Change-Id: I779c49c48980ba7737ee4e7b04a9e4c3e02fca21

2014-04-14 15:14:01 -07:00

..

java

resolved conflicts for merge of 381ac080 to master

2014-04-14 15:14:01 -07:00

jni

Merge "Fix issue with bitmap uploading"

2014-04-14 20:57:38 +00:00

res

Update action bar for Quantum

2014-04-14 13:15:37 -07:00

tests

Fix ugly black background when expanding/collapsing notifications.

2014-04-11 16:07:44 +02:00