Brian Carlstrom d38905b785 am 7fca8e30: Merge "Disable verification based on vold.decrypt. [frameworks/base]" into lmp-dev ...

* commit '7fca8e30e91f893a2831e63c1a47a86baf2c56b8':
  Disable verification based on vold.decrypt. [frameworks/base]

2014-08-15 17:10:46 +00:00

..

java

Zen: Downtime now a condition provider, persist conditions.

2014-08-15 15:06:15 +00:00

jni

Disable verification based on vold.decrypt. [frameworks/base]

2014-08-15 09:58:03 -07:00

res

am 0ac3062e: Zen: Downtime now a condition provider, persist conditions.

2014-08-15 15:16:19 +00:00

tests

Switch RouteInfo to use IpPrefix instead of LinkAddress.

2014-08-13 21:17:20 +09:00