| commit | ee6855cca71ee2ba01e8afa16ee21a0a6ef524e7 | [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 | ba5c1478ecb5372ed445f0dc5158b933f9e6b929 [diff] | |
| parent | e89e27723e765f557f22670a373deaf7c1dcd47a [diff] |
resolve merge conflicts of 73d9596bc to oc-mr1-dev-plus-aosp Change-Id: I8272038fe905a88273ce9aa690af0ee0005a6b67