tree 25f44c98c1f9967ed8157b42714fa04250950400
parent ef8bd66d5035f245ee80672ed125ebcbf2356b99
parent abc338016df382dbaf464485889ac25841640fb9
author Tianjie Xu <xunchang@google.com> 1537920809 -0700
committer android-build-merger <android-build-merger@google.com> 1537920809 -0700

Revert "Revert "Merge tag 'v1.0.5' into HEAD"" am: a5dcb7cf83 am: 43476b148c
am: abc338016d

Change-Id: I964f8db974cb68efddf22f9f5e767c2a336b01df