summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorQiwen Zhao <zhao@google.com>2015-03-22 00:40:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-22 00:40:44 +0000
commitd34ed0f51697623456ddbca10ef9ccf5367ce952 (patch)
treeccd88ef9f0cd1fe4d1e3516c77caf448e1cc1a5e /services
parent76fa9ec3e831ce97aeb2f1aa688972f5b85d9c30 (diff)
parentde68ef61adef43be293e81ed1e8adcee8ebbbe04 (diff)
downloadframeworks_av-d34ed0f51697623456ddbca10ef9ccf5367ce952.zip
frameworks_av-d34ed0f51697623456ddbca10ef9ccf5367ce952.tar.gz
frameworks_av-d34ed0f51697623456ddbca10ef9ccf5367ce952.tar.bz2
am de68ef61: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.
* commit 'de68ef61adef43be293e81ed1e8adcee8ebbbe04':
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions