summaryrefslogtreecommitdiffstats
path: root/services/usage/java
diff options
context:
space:
mode:
authorFilip Gruszczynski <gruszczy@google.com>2015-02-06 00:16:41 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-02-06 00:16:41 +0000
commitfe7712e758c12e3fbe26c652dc4ca33267210bd0 (patch)
treee4c8ff1685b47f3d72ed89b369dc0b183701847c /services/usage/java
parent3f579c71674784aebb673d4c82abe63e86883546 (diff)
parent96f3462958977a29aeb8acf102dd5e86c4a5417a (diff)
downloadframeworks_base-fe7712e758c12e3fbe26c652dc4ca33267210bd0.zip
frameworks_base-fe7712e758c12e3fbe26c652dc4ca33267210bd0.tar.gz
frameworks_base-fe7712e758c12e3fbe26c652dc4ca33267210bd0.tar.bz2
am 7acd679c: Merge "Add wallpaper controlling system apis." into lmp-mr1-modular-dev
automerge: 96f3462 * commit '96f3462958977a29aeb8acf102dd5e86c4a5417a': Add wallpaper controlling system apis.
Diffstat (limited to 'services/usage/java')
0 files changed, 0 insertions, 0 deletions