| commit | be261948cb8a21a8e145f1f512f6f6bacbd28f34 | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Thu Jun 08 05:42:13 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 08 05:42:18 2017 +0000 |
| tree | f773ec82251630d53ac1c137713084780a556273 | |
| parent | 89d6859dc4d9072df1cc7054fcecfe75f5fc79be [diff] | |
| parent | a27856d443ce65271aa16ea22a7b413e9dd9c664 [diff] |
Merge "resolve merge conflicts of 695f21a66189 to oc-dr1-dev" into oc-dr1-dev