| commit | 935b9e1a3b0951da79a4dd7fced901f0bde1139f | [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 | db7895d192af60b003f3ebfaf94b304c80580760 [diff] | |
| parent | d7e7be50f848c3f9bca6829f235fe9b37b6ddb66 [diff] |
resolve merge conflicts of cb5474b14 to oc-dev-plus-aosp Change-Id: I8392be7b6aac1ebe26cf064e3b7ad93c6aeb6daf