Eric Fischer 19e046c4d2 am 1b159f66: Merge "Import translations. DO NOT MERGE" into jb-dev ...

* commit '1b159f66eed528f9cda04a316a1958a7ce79ee48':
  Import translations. DO NOT MERGE

2012-06-12 12:41:20 -07:00

..

java

am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev

2012-06-12 12:41:12 -07:00

jni

am a7e3a1e0: Merge "Include important native processes in watchdog stacks." into jb-dev

2012-06-11 10:41:09 -07:00

res

am 1b159f66: Merge "Import translations. DO NOT MERGE" into jb-dev

2012-06-12 12:41:20 -07:00

tests

resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp

2012-06-08 13:47:46 -07:00