summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-12-02 07:55:02 -0800
committerJean-Baptiste Queru <jbq@google.com>2010-12-02 07:55:06 -0800
commit40eade14bb87d24903588de04449fdfe2e1795cb (patch)
tree22cf7f66ad807234c28cf352552e9a7e50cfb5ad /services
parent077bc4ac019ad33abd613448e11d3ad501218991 (diff)
parente1de3f390e7be3f82fa5e3e5bf6d6c8cc8414091 (diff)
downloadframeworks_base-40eade14bb87d24903588de04449fdfe2e1795cb.zip
frameworks_base-40eade14bb87d24903588de04449fdfe2e1795cb.tar.gz
frameworks_base-40eade14bb87d24903588de04449fdfe2e1795cb.tar.bz2
Merge from open-source master
Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions