| commit | c9208d362fdbe2c2ba980581216c770af29901fe | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jun 08 05:48:45 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 08 05:48:49 2017 +0000 |
| tree | acba543300fd6eddaabb20ff0a39fd12c7fcb121 | |
| parent | 54a6869814d02a183c11d1bad2ab2f2d53d3f11c [diff] | |
| parent | 8a03d88812d7918621a9c21184b90136cd3bcf5f [diff] |
Merge "Merge "resolve merge conflicts of 695f21a66189 to oc-dr1-dev" into oc-dr1-dev am: be261948cb" into oc-dr1-dev-plus-aosp