summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-12-20 14:31:16 -0800
committerThe Android Automerger <android-build@android.com>2012-12-20 14:31:16 -0800
commit345f7fcfaf86ece0fa346f1b20577b0b63a84c06 (patch)
tree2a912d2833498c256b7d2d974d1a30ea6e170cd6 /services
parente487e537b0fcc5b9f972c1e247fd1b019150fa05 (diff)
parent2d6ed407a7d5518cd5f46f242b463ba606408e73 (diff)
downloadframeworks_base-345f7fcfaf86ece0fa346f1b20577b0b63a84c06.zip
frameworks_base-345f7fcfaf86ece0fa346f1b20577b0b63a84c06.tar.gz
frameworks_base-345f7fcfaf86ece0fa346f1b20577b0b63a84c06.tar.bz2
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions