tree 1a7099d30167f5c573a41bade5e7626f2e921292
parent 003e78739d804d5b7f351b7921ff98781cc503da
parent 658f09ab757297025b72d5ac80e6081b7b979ec0
author Logan Chien <loganchien@google.com> 1512958175 +0000
committer android-build-merger <android-build-merger@google.com> 1512958175 +0000

Merge changes I25e81a77,I95b8c142
am: 658f09ab75

Change-Id: Id7c2bf40a79bf26d9f2f4a552ec1ec8cda45def3