summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2016-09-16 16:57:34 -0600
committerThe Android Automerger <android-build@android.com>2016-09-27 16:28:39 -0700
commitf653d365122f0cebc92ac7bb0af805cc4d80f638 (patch)
treeb10c1e310a5e3b1725731c750ad2cd6b54b50f44 /services
parent4c95059c31584cbd5651183a4605301563cf2e8e (diff)
downloadframeworks_base-f653d365122f0cebc92ac7bb0af805cc4d80f638.zip
frameworks_base-f653d365122f0cebc92ac7bb0af805cc4d80f638.tar.gz
frameworks_base-f653d365122f0cebc92ac7bb0af805cc4d80f638.tar.bz2
Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537
Change-Id: Ib1a0bbb34edb61666ac5739f0b0eaadbe4c5fe06
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions