summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-12-20 15:46:28 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2012-12-20 15:46:28 -0800
commitac0fd124133b04f555047df8804ecc46ef3751e9 (patch)
tree8c68eb119c07b70230abbcf81af63998adca998f /services
parent5ddfa24776f971d45e5fc80189abb3edd715818d (diff)
parent345f7fcfaf86ece0fa346f1b20577b0b63a84c06 (diff)
downloadframeworks_base-ac0fd124133b04f555047df8804ecc46ef3751e9.zip
frameworks_base-ac0fd124133b04f555047df8804ecc46ef3751e9.tar.gz
frameworks_base-ac0fd124133b04f555047df8804ecc46ef3751e9.tar.bz2
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I47c257db0d5a21fe4f6592924ebd47bd8578d5ea
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions