Jeff Davidson 0e78487482 am 9a1da68b: Expose a SystemApi method to prepare a VPN without consent. ...

* commit '9a1da68bf7980449a5ee5d6fa9d9686b04d667ff':
  Expose a SystemApi method to prepare a VPN without consent.

2014-11-17 22:58:12 +00:00

..

java

am 9a1da68b: Expose a SystemApi method to prepare a VPN without consent.

2014-11-17 22:58:12 +00:00

jni

Merge "Implement back-tracking when searching for attributes in XML or resource bag" into lmp-mr1-dev

2014-11-17 19:39:17 +00:00

res

am e0cb56b0: Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev

2014-11-17 22:58:05 +00:00

tests

Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev

2014-11-13 00:33:00 +00:00