| commit | 65d96f774d9a01fd54fd2b3fbfaf21036ba321e6 | [log] [tgz] |
|---|---|---|
| author | Pawin Vongmasa <pawin@google.com> | Wed May 17 21:22:59 2017 -0700 |
| committer | Pawin Vongmasa <pawin@google.com> | Wed May 17 21:22:59 2017 -0700 |
| tree | 694721117ca344247bc4900e6832ee579577949f | |
| parent | 0148ea7b30b0f418a89b1f699d83c8e56407b123 [diff] | |
| parent | 76f1cf0faa94b29c0d7debb5b560642fcf458e92 [diff] |
resolve merge conflicts of 76f1cf0faa to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution.