Tetsutoki Shiozawa af741b2b0b Merge "Abort connecting to native daemon during shutdown" ...

am: aa8608db31

Change-Id: I5b8984d51ff0715b29074cee98197263b5ce1c29

2017-09-13 22:36:59 +00:00

..

core/java/com/android/server

Merge "Abort connecting to native daemon during shutdown"

2017-09-13 22:36:59 +00:00

tests/servicestests/src/com/android/server

Avoid logging sensitive data.

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