tree 99a547147b67c9e5bc947f8c9ad574724f3292aa
parent 74f60ea50a0958e916722402b571312f91f8f451
parent 3dfaa4449136bb48b504a9d39e380e7665acf3d1
author Steven Moreland <smoreland@google.com> 1492653040 +0000
committer android-build-merger <android-build-merger@google.com> 1492653040 +0000

Merge changes from topic 'system-vendor-internal-pick'
am: 3dfaa44491

Change-Id: I9e782c46d9ddf43b61c8feb5e2c33f2a295e8358