tree dcd3b41b48dd6975a1e44d3495f44a8dacc7a9d3
parent 78f2c228d15503b05d6ff70c8fd739874f27088c
parent 1451124f86c70b70eeb6908dd9a8248f9e8e2ea6
author Masaho Nishikawa <masaho.nishikawa@sony.com> 1520059185 +0000
committer android-build-merger <android-build-merger@google.com> 1520059185 +0000

Merge "Add config to show an alert dialog for video charges"
am: 1451124f86

Change-Id: Idf89d421f3716dc00af97877d19d81445dd63f44