tree a07f0f707d4c2bd0667107cafef4e5db698fe6a0
parent 6583d9860ed64982c57367deabe3449a7efea55b
parent 9fab4ad9b39dcbca06f9bd9aedc983a7285782fa
author Tyler Gunn <tgunn@google.com> 1490934740 +0000
committer android-build-merger <android-build-merger@google.com> 1490934740 +0000

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

Change-Id: I4e75f6c7f3cf5deb7e98dddb668be350d1c60dd9