tree 3d9aefbcf693d18d71bee2669f1d6646944edeb7
parent 2d93a66f4754691e2fb0b9e04f1196a220e71bd1
parent 6a643c3a60202b7941447b23e112650917052eb1
author Tyler Gunn <tgunn@google.com> 1486425909 +0000
committer android-build-merger <android-build-merger@google.com> 1486425909 +0000

Merge "Self managed CS implementation." am: d736a6b2c2 am: 6bd991b3d2
am: 6a643c3a60

Change-Id: I43f59846ecc7601730aa3a15b106292d7ace0df0