tree e2db2d77262c837d7668aff69acb5cf61829e91d
parent 8a58085aa08bcf7c820e374e433ee27b1a2768dc
parent 7a89f57e2ba1bdb9f4226968562eb3efcf1bca8f
author erfanian <erfanian@google.com> 1529527877 -0700
committer android-build-merger <android-build-merger@google.com> 1529527877 -0700

Merge "Take in to account video upgrade requests in some circumstances." am: 1ac55a1472
am: 7a89f57e2b

Change-Id: Ibf3616608fbc3cc6a2a0f390bd0dc57a9b90c7b9