commit | 54a330406ad530cd0129d705eccc62377b2fb4ed | [log] [tgz] |
---|---|---|
author | Tyler Gunn <tgunn@google.com> | Thu Aug 31 15:31:40 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 31 15:31:40 2017 +0000 |
tree | 44748474edd84bec44c6748e1d14e1e34d2db9c2 | |
parent | 396ca054030e75d3c5d704ba7914b30604ee32bc [diff] | |
parent | 5185dd85caad41fd4041b7d9dc604a1296cce2a2 [diff] |
Merge "Ensure upgrade to video requests are ignored when video disabled." into oc-mr1-dev am: a9732050e1 am: 5185dd85ca Change-Id: I86e50ef485c9b8ac8113eedc4201367df1714df8