tree 147fd4f1b9e8fcf141d67c049a0bd1196cb93427
parent 18d38be88d6d6729831d2ace786c700ec6e1e975
parent 72cb924f072b6a09d0b08c7b16d5306064d76111
author Tyler Gunn <tgunn@google.com> 1490935098 +0000
committer android-build-merger <android-build-merger@google.com> 1490935098 +0000

Merge "Self Managed CS Implementation" am: 98fad21a8a am: 9fab4ad9b3
am: 72cb924f07

Change-Id: Ia16c6125567ceac4edfff095e737751c46fde7bf