| commit | 3a9f256329b17d192e0018ae58a3d125b94f78bf | [log] [tgz] |
|---|---|---|
| author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | Thu May 18 10:57:09 2017 +0100 |
| committer | Przemyslaw Szczepaniak <pszczepaniak@google.com> | Thu May 18 10:57:09 2017 +0100 |
| tree | 0def4ae12e9c949c7600e6c3f8e2e827d3982f7c | |
| parent | 5bda8323c522a51278935f3eda25ebe9ee00308a [diff] | |
| parent | 2ce1b38e85afc8fd8f3228fcd5a6b14cf44b93d0 [diff] |
resolve merge conflicts of 2ce1b38e85af to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: Ia1eb0590edf2b074f6cbf16060cda2257091edd8