Ian Rogers ae82b979bb Merge "Fix 2 instances of buggy double check locking on non-volatile fields."

2016-05-19 05:19:29 +00:00

..

core/java/com/android/server

Merge "Fix 2 instances of buggy double check locking on non-volatile fields."

2016-05-19 05:19:29 +00:00

tests/servicestests/src/com/android/server

Avoid logging sensitive data.

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