aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorFlorina Muntenescu <florinam@google.com>2018-03-05 17:33:34 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-05 17:33:34 +0000
commitc085354dfb0a4d6b63b065dfefac0aabed5c2ed6 (patch)
treeb11e35641eb8072a8bacb4484980db609e31c74c /security
parent460e5035829443504c3d1fa70a9ea907cf7a1bb2 (diff)
parentcc9b4959233a34d7bd146c0e814a281f15fa77bd (diff)
downloadandroid-c085354dfb0a4d6b63b065dfefac0aabed5c2ed6.tar.gz
Integrated changes from public CLs, added tests for custom spans. am: 727e9688ad am: 0de7818936
am: cc9b495923 Change-Id: Iafc2fd9d1ca3c09be0ed2d68656e53266c95742d
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions