commit | b47776240d9c39f4b19234b8413f1dea8684dc70 | [log] [tgz] |
---|---|---|
author | Brad Ebinger <breadley@google.com> | Wed Aug 02 23:54:47 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Aug 02 23:54:47 2017 +0000 |
tree | 17619fb78270fa9d51d6f3f3886e7b840341fa7a | |
parent | 7ca703e6e0fd7c79a53c86d56874ac1a0ae87786 [diff] | |
parent | e57175c090629bfec1cf54b4f48aa6d91bf02850 [diff] |
Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d" into oc-mr1-dev am: e57175c090 Change-Id: I7f2776087d873bbd3c25c130a2ee14dfbe6bf7b5