tree 746b58d21a962fca2d776033042c00f81ce02098
parent 0b250b61329f09d0e9e175cf12de61377f253c07
parent abb158f71220709e1f6eb0bfa3225165bc46bd3f
author Jeff Sharkey <jsharkey@android.com> 1516248600 +0000
committer android-build-merger <android-build-merger@google.com> 1516248600 +0000

Merge "Add "not congested" network capability." am: ffaddf73de
am: abb158f712

Change-Id: I2c7276bd657f5805c0b6492a216435270023a3c6