tree 5ae0d7b510e8eb180d55b7f6069c7a367d43c434
parent 610e7400d773b7f4c3c8e0fa211e4094f3d12f3d
parent 113918f3093aa498b6b992accd1c5c0baeed14fb
author Wale Ogunwale <ogunwale@google.com> 1497914877 +0000
committer android-build-merger <android-build-merger@google.com> 1497914877 +0000

Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev
am: 113918f309

Change-Id: I655721c29b22da375742628a9e7b8b3075b2dd27