tree ab55b5aaf0000a9156120f054539086a6567fd84
parent f7a57d613d5ace769094f2cdea3f61a63280b1c4
parent 2c106012fe06890d1e0040b526044d4ecda9ef78
author Michael Plass <mplass@google.com> 1481152528 +0000
committer android-build-merger <android-build-merger@google.com> 1481152528 +0000

Merge "Remove user-triggered disconnect counters" am: 2007ee8de3 am: b8d3324bb7
am: 2c106012fe

Change-Id: Ic89ec00cbf94ca3da131d4aff3bc9df04fc1b4be