| commit | 33323b2399505746bbc639928b3d4f2381e54779 | [log] [tgz] |
|---|---|---|
| author | Borjan Tchakaloff <borjan@fairphone.com> | Fri Dec 15 09:21:28 2017 +0100 |
| committer | Borjan Tchakaloff <borjan@fairphone.com> | Fri Dec 15 09:58:05 2017 +0000 |
| tree | 017be2de2c878b4aba030b9ff45deb84aeaf75f7 | |
| parent | 9657c85714bfd7c950add42b5a22b1ac5667bd53 [diff] | |
| parent | a8e0dabdaab565369917e131d45f39f564bf2fb7 [diff] |
Merge branch 'fp2-m-sibon' into branch 'prebuilts' Sync diverging branches after erroneous cherry-pick on fp2-m-sibon. Change-Id: If588fcbdf590f8ef5cd322062e87b353d0c20207