Chia-chi Yeh 7c727e50f1 am a2becffc: am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev ...

* commit 'a2becffcf2a19889b90256a8479e276081ce6108':
  VPN: move VpnDialogs away from system uid.

2012-06-12 12:59:59 -07:00

..

java

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

2012-06-12 12:59:59 -07:00

jni

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

2012-06-11 10:44:52 -07:00

res

Import translations. DO NOT MERGE

2012-06-11 11:51:42 -07:00

tests

am d26f7139: Merge "resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp" into jb-dev-plus-aosp

2012-06-08 14:08:28 -07:00