Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black" am: 2f6b711ffa -s ours" into nyc-mr2-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2017-01-17 19:08:00 +00:00
committed by Android (Google) Code Review

Diff Content Not Available