tree 8bfa24528e00942375a2638edc35f53f86d2296f
parent f23fd1ca6c2c7e7cd118eaeb6b99e2f94c0eed70
parent 829b6062c3246a683a8c2c54d10f5ad8ce113b0c
author Nan Zhang <nanzhang@google.com> 1534536858 -0700
committer android-build-merger <android-build-merger@google.com> 1534536858 -0700

[automerger skipped] Removed Metalava related checks am: 863f05b797 am: 8e8129b1ed
am: 829b6062c3  -s ours

Change-Id: Iab47cdd8ad4231fe8477c72882d74c8f68657de0