| commit | 56d6e891bef53c5e18d5f95c9cde84bb57d9693c | [log] [tgz] |
|---|---|---|
| author | Vijay Venkatraman <vijaykv@google.com> | Fri Apr 07 13:24:00 2017 -0700 |
| committer | Vijay Venkatraman <vijaykv@google.com> | Fri Apr 07 13:25:24 2017 -0700 |
| tree | c894fc38c2f09f2786375c5a2a4454f600b51e4b | |
| parent | 755cdc61736bf177b611c3dba30d8c686a060de0 [diff] | |
| parent | cb5474b14051ba71130df80108700ff46a62e655 [diff] |
resolve merge conflicts of cb5474b14 to oc-dev-plus-aosp Change-Id: I8392be7b6aac1ebe26cf064e3b7ad93c6aeb6daf