| commit | ee18e78d817dd5c66ab9fcf72e96f3cfc0bb8c3c | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Mon Jun 12 13:45:50 2017 -0700 |
| committer | Jorim Jaggi <jjaggi@google.com> | Mon Jun 12 13:45:50 2017 -0700 |
| tree | 6b388318b3edbe6482305b6d765d4fb7fb191a31 | |
| parent | 5148d9fe8153da418dfe58919043e8daf1df195d [diff] | |
| parent | 8f1d13300f737e19d8976e0498f9c4a35acee769 [diff] |
resolve merge conflicts of 8f1d13300f73 to oc-dr1-dev Change-Id: I1a30ba6663041e1ce0a2d347671deb83b1d9d7ff