tree fc32272c1ba6df610ea0affed725b7552e8f82be
parent 5e9211080364ad4d30c5b97cf95ce825b740672a
parent 80c9aa0ff8916d26f163e7bad20b42616e42ffb4
author Xin Li <delphij@google.com> 1560217100 -0700
committer android-build-merger <android-build-merger@google.com> 1560217100 -0700

Merge "Make license block consistent with the whole package." am: 063e04f971 am: 66c6769847 am: ce33f84daa
am: 80c9aa0ff8

Change-Id: I426af2de2e5449fecba60b62fd6cb0ee4f3071c4