| commit | e8ac034b88ce3536eb8aec8c1a761f5abce2117b | [log] [tgz] |
|---|---|---|
| author | pkanwar <pkanwar@google.com> | Wed Jun 14 08:15:02 2017 -0700 |
| committer | pkanwar <pkanwar@google.com> | Wed Jun 14 08:15:35 2017 -0700 |
| tree | 824d2b2530c9ce7db235bc01871c8cddbd806fb5 | |
| parent | 72edf50854eb2e8fd81547a3e383da0330a848b5 [diff] | |
| parent | fa4d17b5249ca715ec0045899e8f22b5c456e6e1 [diff] |
resolve merge conflicts of fa4d17b52 to oc-dev-plus-aosp BUG: 35606429 Test: manual Change-Id: Ic0c0aa2cfb5e72ac8eb810b92fa29e0777cb7cd1