Adam Powell 4173a89d12 am 61a826ef: am 70e37696: Merge "Fix ActionBar#setHomeActionContentDescription(0)" into jb-mr2-dev ...

* commit '61a826eff10c4b275a9569a0edd6301924a6d4e7':
  Fix ActionBar#setHomeActionContentDescription(0)

2013-04-18 14:50:42 -07:00

..

java

am 61a826ef: am 70e37696: Merge "Fix ActionBar#setHomeActionContentDescription(0)" into jb-mr2-dev

2013-04-18 14:50:42 -07:00

jni

resolved conflicts for merge of 6c18e2c8 to master

2013-04-17 10:33:23 -07:00

res

Merge "First draft of Scenes & Transitions feature"

2013-04-18 20:38:17 +00:00

tests

Make download manager tests more reliable.

2013-04-09 15:08:43 -07:00