tree 32f60de38b3153bc5d3deefd3c572d564c0b9fe9
parent b9c5a43211646c7b50e750d54383a7fbf30bae17
parent 7e59d5a093323bb7d566152bd32a9b124850c900
author Elliott Hughes <enh@google.com> 1495580137 +0000
committer android-build-merger <android-build-merger@google.com> 1495580137 +0000

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

Change-Id: I9bbb111c30497942565617ed35951d27669206ef