tree 7b85345d93582c796dc5f7f1b1c5cbd468cdf61a
parent be0889cf6f87e7d5eb140529c1354006fe9ff640
parent 4b621102626ee3a798da5113dde0afa3dce785a0
author Amith Yamasani <yamasani@google.com> 1471987705 +0000
committer android-build-merger <android-build-merger@google.com> 1471987705 +0000

Merge "Don't complain about sender of MASTER_CLEAR" into nyc-mr1-dev am: 50ff32c17f
am: 4b62110262

Change-Id: I277aabd654295050509266abc7461a4a2802b5b9