OSDN Git Service

Merge "Merge "Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 17 Jan 2017 19:21:29 +0000 (19:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 17 Jan 2017 19:21:33 +0000 (19:21 +0000)

Trivial merge