| commit | e88dccd34268a386e44f872dcfcec2533a051b9c | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Wed Sep 20 21:36:13 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 20 21:36:13 2017 +0000 |
| tree | 96f342849124b4835d7c807af5d4c484420c0e2f | |
| parent | 8b47520415579d4b5a9d728129d902ccd1b39231 [diff] | |
| parent | 35c2e03211712c1ea75da409134a2c5c4d1841f1 [diff] |
Merge "Ensure upgrade to video requests are ignored when video disabled." am: 236b6f319e am: 29ec0fb190 am: 35c2e03211 Change-Id: Ibe164aa5d4cad8c7f248dccdf2b91d64871edef4