commit | 12d23e7f0fb04e104b6959bca14a3c4e2625487b | [log] [tgz] |
---|---|---|
author | Andrew Rossignol <aarossig@google.com> | Tue Jan 17 19:07:05 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jan 17 19:07:05 2017 +0000 |
tree | b2007dbd74b49f03b625e03daf49b98f4eae75c1 | |
parent | 2aa5a90c41ace84a9c78ecc711e08048fcef5c1d [diff] | |
parent | ebf7abb19ebff36f6becaffb922165fc918db4ae [diff] |
Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev am: ebf7abb19e -s ours Change-Id: I6c185f604e899f27a5c75aae883fd15de11033da