OSDN Git Service

Merge "Self managed CS implementation."
authorTyler Gunn <tgunn@google.com>
Mon, 6 Feb 2017 22:40:39 +0000 (22:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 6 Feb 2017 22:40:39 +0000 (22:40 +0000)
am: d736a6b2c2

Change-Id: I9c1a84cade87a208f2e509fb0f32457c64014147


Trivial merge