tree 0bf0e31a61b75de616d7c7ddb3c85d9e488507e0
parent f2fd47bfa5533bb9e57b37760edde71776048c88
parent 5c9378f310acd4ab375ed8a5d703a86522ab814c
author Adam Lesinski <adamlesinski@google.com> 1455833015 +0000
committer android-build-merger <android-build-merger@google.com> 1455833015 +0000

DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle am: 1559fed4c4  -s ours
am: 5c9378f310  -s ours

* commit '5c9378f310acd4ab375ed8a5d703a86522ab814c':
  DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle