tree b981f4bbbcbb223a86f82a13c5695e6fc7acf64b
parent 6d0b9877d419a1d672aa7db83989f9756f62a91f
parent 0cb44574d0a2b06e42b121143f351b2ebff21b54
author Ian Lake <ilake@google.com> 1500930917 +0000
committer android-build-merger <android-build-merger@google.com> 1500930917 +0000

Merge "Fix Support Lib names for app-toolkit" into oc-support-26.1-dev
am: 0cb44574d0

Change-Id: I7ce48f29e80c64e6a32e4ac9545854a7ae3bc1e6