Elliott Hughes 90e2301e23 am d2a11d97: Merge "Add explicit close of Scanner input" ...

* commit 'd2a11d97a94bed18629bded429f118f57f4f7821':
  Add explicit close of Scanner input

2014-04-11 17:18:14 +00:00

..

com/android/server

Merge "Launcher APIs and broadcasts for managed profiles"

2014-04-08 22:04:20 +00:00