| commit | 434d1890a28d6b885007e2f69b649691ee7e1240 | [log] [tgz] |
|---|---|---|
| author | Aaron Holden <aaronholden@google.com> | Wed Apr 12 14:47:12 2017 -0700 |
| committer | Aaron Holden <aaronholden@google.com> | Wed Apr 12 21:47:56 2017 +0000 |
| tree | 4e6ee4ee1e3be602837f2e806f5f5970a1ab2cdd | |
| parent | 469c71a77090566bdc6c495b955bba09bf37f9df [diff] | |
| parent | 046c37c26628d743ec5976d78449eb8bfe4e1fa1 [diff] |
resolve merge conflicts of 046c37c266 to nougat-mr1-cts-dev Test: I solemnly swear I tested this conflict resolution. Change-Id: Iaa3d716b87d2155dc5b0965cafeb47c87ba60be5 merged-in: I4f57e03e78fbe21fe4fa0635a68f8e2c88bd43c9 merged-in: I599b6cb03571ad9de65c7f18f924867d7b707034