Jeff Sharkey b1f84a006f Merge changes I9971c466,Ib42474fd into mnc-dev ...

* changes:
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.

2015-07-08 21:55:54 +00:00

..

core/java/com/android/server

Merge changes I9971c466,Ib42474fd into mnc-dev

2015-07-08 21:55:54 +00:00

tests/servicestests/src/com/android/server

Avoid logging sensitive data.

2013-06-07 15:09:32 -07:00