commit | 243c0172f9b1eaa9a9ed60089af60c275e09981c | [log] [tgz] |
---|---|---|
author | Andrew Rossignol <aarossig@google.com> | Tue Jan 17 19:20:24 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jan 17 19:20:24 2017 +0000 |
tree | 1442be72014ea19625c85baa7a641e35885cef19 | |
parent | 5fb5bc728f8cdd5d2d4213859ac05beac71e8a92 [diff] | |
parent | 12d23e7f0fb04e104b6959bca14a3c4e2625487b [diff] |
Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev am: ebf7abb19e -s ours am: 12d23e7f0f -s ours Change-Id: I6e20730a0aefe324a53b3565fd966d0112c5bfea