| commit | 34f88847df780dbb2d0a5b117a738c56d574ca6a | [log] [tgz] |
|---|---|---|
| author | Bartosz Fabianowski <bartfab@google.com> | Tue Oct 18 11:09:38 2016 +0200 |
| committer | Bartosz Fabianowski <bartfab@google.com> | Tue Oct 18 11:09:38 2016 +0200 |
| tree | a0c0c0ba6d22966e3275b8d18996f2331dba6297 | |
| parent | a3b1b1d9730d03681c17fa526d053e5a471367b0 [diff] | |
| parent | 78abf16bb442a85814d453dfcd0b6946b4f89bcf [diff] |
resolve merge conflicts of 78abf16 to nougat-cts-dev Change-Id: I04e669d20c0fd67e6e215f82b1bc4bae7189d631