Merge "Add "not congested" network capability." am: 8a3f579d09
am: bdf2bcc73d

Change-Id: Ie901fd5f67383950c4789479f945379b4f274fd4
tree: 19d50c258b3989c6aa9fc2c0de5663caaa562e06
  1. java/
  2. Android.mk