| commit | c92c0269eedf674350bc40025433c5e51b4687fe | [log] [tgz] |
|---|---|---|
| author | Android Merger <noreply-android-build-merger@google.com> | Tue Jun 12 00:04:22 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jun 12 00:04:22 2018 +0000 |
| tree | 9c0cf83a6a79dffc987d16949d80f67afc0e809e | |
| parent | 98269b486ddaadba1b4295f2c3a1130aee044fe4 [diff] | |
| parent | 1cf0e18c4d1b81ce2fcfe46f6f50f18ecf4116a0 [diff] |
Merge changes from topic "am-3cdf2ccd35624e28b821e85b3120f82e" into nougat-cts-dev * changes: Merge changes from topic "m" into marshmallow-cts-dev am: 8086810652 [automerger skipped] DO NOT MERGE: sonivox: fix hang caused by bad meta-event (cts) am: 035f84a68a -s ours