Michael Jurka 1c46536721 am 7566abd3: Merge "Add support for changing status widget on security screen" into jb-mr1-dev ...

* commit '7566abd305a2b3060ae541055ed04f087f5266ec':
  Add support for changing status widget on security screen

2012-09-21 17:45:04 -07:00

..

java

am 7566abd3: Merge "Add support for changing status widget on security screen" into jb-mr1-dev

2012-09-21 17:45:04 -07:00

jni

am 3034d451: Merge "Fix for native crash on image decode OOM" into jb-mr1-dev

2012-09-21 17:44:54 -07:00

res

Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

2012-09-21 15:31:08 -07:00

tests

Merge "fix broken user build: do not throw an error when in user flavor." into jb-mr1-dev

2012-09-20 15:35:00 -07:00