Jeff Sharkey 1db64c1938 am ce0965e2: am 262c89dc: am d19555d9: am 38cae6c8: Merge "Reconcile private volumes when mounted." into mnc-dev ...

* commit 'ce0965e2fa97e8a6c0ce493276ec265ffac8c072':
  Reconcile private volumes when mounted.

2015-07-06 19:17:53 +00:00

..

java

am ce0965e2: am 262c89dc: am d19555d9: am 38cae6c8: Merge "Reconcile private volumes when mounted." into mnc-dev

2015-07-06 19:17:53 +00:00

jni

am 93bb2bf2: am 761e39e1: Merge "Switch to using android.system.Os for more calls"

2015-07-04 02:58:40 +00:00

res

Import translations. DO NOT MERGE

2015-07-06 10:29:06 -07:00

tests

am 49aeed9f: am 5f950417: Merge "Fix use of reachable DNS server logic" into mnc-dev

2015-06-30 06:55:42 +00:00