summaryrefslogtreecommitdiffstats
path: root/trusty
diff options
context:
space:
mode:
authorJosh Gao2017-08-21 18:41:53 -0500
committerandroid-build-merger2017-08-21 18:41:53 -0500
commit46244a6497ac6b0b1a589e40a67d0f99f462ba1e (patch)
tree05e3d65a0b069f961facdb9e4fe664c911a9fa14 /trusty
parent9a1e060dc6fc2be5b661ced7571b2f291a0a1507 (diff)
parent2066e0585e9d3758a556a1c9d040ab86cf63ec2e (diff)
downloadplatform-system-core-46244a6497ac6b0b1a589e40a67d0f99f462ba1e.tar.gz
platform-system-core-46244a6497ac6b0b1a589e40a67d0f99f462ba1e.tar.xz
platform-system-core-46244a6497ac6b0b1a589e40a67d0f99f462ba1e.zip
Merge changes I2270cc0a,I55e5dc5a
am: 2066e0585e Change-Id: I72f3a3272bcce4f0e4f24050e5035810be040ec9
Diffstat (limited to 'trusty')
0 files changed, 0 insertions, 0 deletions