OSDN Git Service

Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black" am: 2f6b711ffa...
authorAndrew Rossignol <aarossig@google.com>
Tue, 17 Jan 2017 19:19:01 +0000 (19:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Jan 2017 19:19:01 +0000 (19:19 +0000)
commit5fb5bc728f8cdd5d2d4213859ac05beac71e8a92
tree1442be72014ea19625c85baa7a641e35885cef19
parentd2e6df3cef9ea51046d88c0e5003befbde526ee7
parentcb9d39e43888d5d5777a77273a2d4ed0e7424be8
Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black" am: 2f6b711ffa  -s ours" into nyc-mr2-dev-plus-aosp
am: cb9d39e438  -s ours

Change-Id: I75af3d982854efe6a1b71cb5aa7d433c325a2f2b