tree 3a2b10641713471361533f713126f63309c6087e
parent 062e101ffaf09e7e3f68a63d828075b2a1c87b8a
parent 2c773d3f96235493d10f17fe8a95b82d5de5b11c
author Masaho Nishikawa <masaho.nishikawa@sony.com> 1520059861 +0000
committer android-build-merger <android-build-merger@google.com> 1520059861 +0000

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

Change-Id: If13158f209eda968f0fd50787679c957a3e5ea96