tree 32f60de38b3153bc5d3deefd3c572d564c0b9fe9
parent b9c5a43211646c7b50e750d54383a7fbf30bae17
parent 987834c810b174ac580d4855ddf1f32bdae0e82a
author Elliott Hughes <enh@google.com> 1495580289 +0000
committer android-build-merger <android-build-merger@google.com> 1495580289 +0000

Merge tag 'v0.6.0' into mymerge am: 85be92fb23 am: 6c5e3322de am: 7e59d5a093
am: 987834c810

Change-Id: I14d511cd8d62c97aae2e010eafd478e212c42b81