Adam Lesinski 63668e8ab0 Merge commit '5142a2d5b3f70c2017792ce04d3f254221ab3d21' into manual_merge_5142a2d5b3 ...

Change-Id: I6681b0e132e95bd7e861e183e7369b4da07738eb

2016-01-28 11:55:58 -08:00

..

java/com/android/server/usage

Merge commit '5142a2d5b3f70c2017792ce04d3f254221ab3d21' into manual_merge_5142a2d5b3

2016-01-28 11:55:58 -08:00

Android.mk

Remove system_server classes from the boot image.

2014-08-15 13:37:03 +01:00