OSDN Git Service

Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black" am: 2f6b711ffa...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 17 Jan 2017 19:08:00 +0000 (19:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 17 Jan 2017 19:08:03 +0000 (19:08 +0000)
commitcb9d39e43888d5d5777a77273a2d4ed0e7424be8
treeb5164a0df0d268ace67eefc3f35cf1a9e10b3ad7
parentbc5fd9934776ba261710411bf5e06e2e27ff52ea
parent2aa5a90c41ace84a9c78ecc711e08048fcef5c1d
Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black" am: 2f6b711ffa  -s ours" into nyc-mr2-dev-plus-aosp