| commit | 82b80624f4a81421f1612a055194fc1d8b89c8fe | [log] [tgz] |
|---|---|---|
| author | Yohei Yukawa <yukawa@google.com> | Tue Jan 16 11:56:43 2018 -0800 |
| committer | Yohei Yukawa <yukawa@google.com> | Tue Jan 16 11:56:43 2018 -0800 |
| tree | bdd3c97fa4679e81875dcffdbda42b5a7c17320a | |
| parent | 1326c9944beb39751e659ad7fd3dd2abcf6816b7 [diff] | |
| parent | fa2e5aafdfeff8200139b94f380d21cfbb45c5cb [diff] |
resolve merge conflicts of fa2e5aafdfeff8200139b94f380d21cfbb45c5cb to nougat-cts-dev Bug: 69872509 Bug: 70280713 Test: I solemnly swear I tested this conflict resolution. Change-Id: I58e54d4a536134ce80a887dd180471f0e32915db Merged-In: Idd5632111a839f7e7c3145d974e2b364f1a19d21