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