tree bbb3202c702747cb1cac24d68be93e9fe30abd9b
parent 3d2783c82b796a855f4163865fe2f543fa2f64a2
parent 25cbfe8af8b7ec7abbf0e2b166329c9fcb7fc87e
author Rob Carr <racarr@google.com> 1475868654 +0000
committer android-build-merger <android-build-merger@google.com> 1475868654 +0000

Merge "When adding dialog window but not creating update the configuration." into nyc-mr1-dev am: 93becf5148
am: 25cbfe8af8

Change-Id: If977968046903069959e4f849547c7aff7d6f597