Sascha Prueter ab989ac313 am 8149820c: am 25458528: am dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev ...

* commit '8149820c2b2df47028498571785ca009d99b5dc9':
  Handle "CODE_ALREADY_PRESENT" message from Settings app

2012-12-17 10:49:38 -08:00

..

java

am 8149820c: am 25458528: am dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev

2012-12-17 10:49:38 -08:00

jni

am 898d8048: am 2eca1b53: Merge "Add return after NULL check in JetPlayer"

2012-12-15 15:10:34 -08:00

res

am 0ec825ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

2012-12-14 11:55:37 -08:00

tests

Move Observer test to servicetests

2012-12-11 11:15:25 -08:00