summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2014-10-22 01:21:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-22 01:21:05 +0000
commit2f368e57e58c6bc3ab291d6318b19c6698fc184b (patch)
treea31856463080cc988378d937e59c7318c1b815ca /services
parent3873c920b830fcea2979a5bf6097bfd5810957f9 (diff)
parentc3ddddbd4ec1fe2c570a25925db6b396fb83badf (diff)
downloadframeworks_av-2f368e57e58c6bc3ab291d6318b19c6698fc184b.zip
frameworks_av-2f368e57e58c6bc3ab291d6318b19c6698fc184b.tar.gz
frameworks_av-2f368e57e58c6bc3ab291d6318b19c6698fc184b.tar.bz2
Merge branch 'lmp-sprout-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/av into lmp-sprout-dev
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions