Craig Mautner 7f24ce696a am ccafb1ad: am 437a0fbd: Merge "Introduce multiple displays with DisplayContent." into jb-mr1-dev ...

* commit 'ccafb1ad5d60d70baa7f4fbf155e906261e42953':
  Introduce multiple displays with DisplayContent.

2012-08-02 15:08:51 -07:00

..

java

am ccafb1ad: am 437a0fbd: Merge "Introduce multiple displays with DisplayContent." into jb-mr1-dev

2012-08-02 15:08:51 -07:00

jni

am 5d89b70a: am 413ab3a5: Merge "Improve gradients" into jb-mr1-dev

2012-07-31 19:00:58 -07:00

res

Import translations. DO NOT MERGE

2012-08-01 12:58:36 -07:00

tests

am 194da0b8: am a39fdd11: Merge "Fix AccountManagerServiceTest" into jb-dev

2012-07-31 12:36:35 -07:00