tree 485deedd019523e348f98b30152c7707b53ddeb2
parent 5ffb1a08f23d58845e0da9ba25fd44abbf000c0a
parent ced9a42f4a0332b8060da23f70cf0aaa05e1bb29
author Android Build Merger (Role) <android-build-merger@google.com> 1464976582 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464976584 +0000

Merge "Merge "Avoid triggering support dialog in non-current user." into nyc-dev am: 5548733eb5 am: 2a098206c4 am: 2590281320"