Jeff Sharkey fb09c375b1 am 2b3a47b9: Merge "Allow L2TP traffic to lockdown VPN servers." ...

* commit '2b3a47b9ce0f422323395286937944a2afa51ed6':
  Allow L2TP traffic to lockdown VPN servers.

2013-02-21 14:15:53 -08:00

..

common_time

…

input

am ceec31b7: Merge changes I5a218ca1,I853a76d9

2013-02-15 14:28:22 -08:00

java

Merge "Allow L2TP traffic to lockdown VPN servers."

2013-02-21 18:33:29 +00:00

jni

Merge "BatteryService: Treat USB charging ports and charging accessories as AC"

2013-01-30 23:20:18 +00:00

tests/servicestests

Migrate to using Mockito directly.

2013-02-19 15:28:19 -08:00