tree 3fcff8a2bdc6efa8077cb4d71cf99f898dfd027f
parent b99a48f779747edbefb5d693b394fe659893405f
parent 98704bc4957eb55c4abbd528f85173a15fa59bb2
author Nicolas Prevot <nprevot@google.com> 1465822211 +0000
committer android-build-merger <android-build-merger@google.com> 1465822211 +0000

Merge \"Fix rendering of policy transparency activity.\" into nyc-dev
am: 98704bc495

Change-Id: I42bba7f5351b214b45255d9e48c3c6802b306b14