| commit | 7f2953e9876cba25b2c0bab98320a38556d30150 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Fri Jul 28 16:15:29 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 28 16:15:29 2017 +0000 |
| tree | 2390e7fd39f4befed97f3410f33ba83e2408a31f | |
| parent | 3a38b51ae87930d9d50b27ff27a59d41b8698be9 [diff] | |
| parent | a38b9363c9add4e232d68ac8f05175329c4b334c [diff] |
Merge "resolve merge conflicts of 19d8e4e04e6c to oc-mr1-dev" into oc-mr1-dev