| commit | 482e35d51a01f2c45d54a593b03cb056a697197e | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Aug 02 23:57:26 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 02 23:57:26 2017 +0000 |
| tree | 70e80631054132dbae79ebfce39c8f1dfe216a01 | |
| parent | 68122681b97fc2f8d43147313ed724dcdae27b5a [diff] | |
| parent | b47776240d9c39f4b19234b8413f1dea8684dc70 [diff] |
Merge "Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d" into oc-mr1-dev am: e57175c090" into oc-mr1-dev-plus-aosp