tree 9b4397d8179a430fe437fc39a615580244bac9fc
parent 26bae92d68fce39456fed5bb9484a9b0c80224c0
parent 3bc084188e06b03b3239fe126d09fa926db023b0
author Tyler Gunn <tgunn@google.com> 1486578459 +0000
committer android-build-merger <android-build-merger@google.com> 1486578459 +0000

Merge "Self-managed CS implementation continued." am: 13378b9966
am: 3bc084188e

Change-Id: If4f66d61ed0d83d46c931906adeef5248b831347