OSDN Git Service

Merge commit '5142a2d5b3f70c2017792ce04d3f254221ab3d21' into manual_merge_5142a2d5b3
authorAdam Lesinski <adamlesinski@google.com>
Thu, 28 Jan 2016 19:55:58 +0000 (11:55 -0800)
committerAdam Lesinski <adamlesinski@google.com>
Thu, 28 Jan 2016 19:55:58 +0000 (11:55 -0800)
commit63668e8ab04c1eb05b8d63371c3547677129f1b9
treeef1b6c627826da5d21731f04de0ff498c2999d77
parent26387474faacc3ba9e1f19fb719db728f1b0a85a
parent5142a2d5b3f70c2017792ce04d3f254221ab3d21
Merge commit '5142a2d5b3f70c2017792ce04d3f254221ab3d21' into manual_merge_5142a2d5b3

Change-Id: I6681b0e132e95bd7e861e183e7369b4da07738eb
services/usage/java/com/android/server/usage/UsageStatsService.java
services/usage/java/com/android/server/usage/UserUsageStatsService.java