tree c406c02a917a24ffe59078029d056796bdbf116c
parent a3b33dad0761d13f273719113a2824ad9d100106
parent 885730d69b5f844f1c59f6de809495726290ae22
author Haibo Huang <hhb@google.com> 1536615883 -0700
committer android-build-merger <android-build-merger@google.com> 1536615883 -0700

Merge tag 'v1.0.5' into HEAD
am: 885730d69b

Change-Id: I8a23bf0839b2150792db62caaf36c773c5c10546