| commit | 62398781f5a4ce32906cdbfc1ad8c34357e19eac | [log] [tgz] |
|---|---|---|
| author | Bowgo Tsai <bowgotsai@google.com> | Sat Sep 30 06:37:39 2017 +0800 |
| committer | Bowgo Tsai <bowgotsai@google.com> | Sat Sep 30 06:44:32 2017 +0800 |
| tree | 9156a5a5b80ac7132a5aae305e1badd7dc8cd59c | |
| parent | f196067a8f2eb6d6efb02d1c05d698d7065e3b9e [diff] | |
| parent | 73d9596bcd9103a92f51aae99f34f7b51366e76b [diff] |
resolve merge conflicts of 73d9596bc to oc-mr1-dev-plus-aosp Change-Id: I8272038fe905a88273ce9aa690af0ee0005a6b67