commit | f05688473406dcc3f535bd42105d6061dc627907 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Jan 17 19:21:29 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jan 17 19:21:33 2017 +0000 |
tree | 311b3453c96c5d7921f7d58c9bd7bf3ac509ab80 | |
parent | 5471cfc7508a2d4de7a0e86ed2525a78d20b8947 [diff] | |
parent | f47a7f5ac9308640399624718806a600bf17d7ce [diff] |
Merge "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"