| commit | 1eedb9c214cdcab61aa4b2decb61d4fd85a5ff61 | [log] [tgz] |
|---|---|---|
| author | pkanwar <pkanwar@google.com> | Thu Apr 27 12:31:39 2017 -0700 |
| committer | pkanwar <pkanwar@google.com> | Thu Apr 27 12:32:07 2017 -0700 |
| tree | 61fa71f0b3651c73ff3b64ae17de57d72de1711e | |
| parent | 8588c09a08180f4c2bdcc654a01164e3edd7cd9a [diff] | |
| parent | 8814befacdf5ffd9a75e7d7648d0d7dd79983b64 [diff] |
resolve merge conflicts of 8814befacdf5 to oc-dev-plus-aosp Test: manual BUG: 35606429 Change-Id: I0e9c5edaaa3e0ddf7719ebbffd650b8bdd88faa1