| commit | 51ccc24d57b966de22d54bd83e21fdd137bbba4d | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue May 02 19:54:21 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 02 19:54:28 2017 +0000 |
| tree | c19f8fa5a5a6c194a9e3a478275ecb4371f7a24c | |
| parent | 86af1cd18fc08fc70fde2aab0317f8f0842eccdb [diff] | |
| parent | 087e2d46ab615a62c768295441ac9d508874d34b [diff] |
Merge "Resolve merge conflicts of ccc5b9bbd02a to oc-dev-plus-aosp" into oc-dev-plus-aosp