| commit | 026c242e76b0f6512fa328bcc5d33dc38950f37d | [log] [tgz] |
|---|---|---|
| author | pkanwar <pkanwar@google.com> | Wed Jun 14 11:39:59 2017 -0700 |
| committer | pkanwar <pkanwar@google.com> | Wed Jun 14 11:40:15 2017 -0700 |
| tree | c268773be8d15543aa7e95d7691ebe0d62d266e8 | |
| parent | 559503e8ec5f2f6e6911533c51b60f944c64dc01 [diff] | |
| parent | e8ac034b88ce3536eb8aec8c1a761f5abce2117b [diff] |
resolve merge conflicts of e8ac034b8 to oc-dr1-dev-plus-aosp BUG: 35606429 Test: manual Change-Id: Ie3e285ea93cfb96f9dfbd2f9f8cb2dd63a81a396