Merge changes from topic 'am-53ce40f4d4244f45b19662f27574d289'

* changes:
  Merge changes from topic 'framework-net-aosp' am: b92aa5bdfd am: 0a7f2d076d am: 9aa93df2b4 am: 256d5cd65f
  DO NOT MERGE: [CS] Remove timeout event after first available am: bf3b1bad15  -s ours am: a8b73b23d6  -s ours am: ce10ba98bf am: 4e7b5c25d8  -s ours
  DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest am: 5d2654124e  -s ours am: 2a2e22ab23  -s ours am: a053ead6a9 am: 8cc63f2554  -s ours
  DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest. am: 5bce5a16b1  -s ours am: efd928fe56  -s ours am: 5cf18abca9 am: fb636d1faa  -s ours
  DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net. am: 7ceef950a0  -s ours am: d1e22a3f07  -s ours am: 4c4a86fd4d am: 3cf39b018c  -s ours
  DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils. am: 3c295b59f5  -s ours am: bcb7e32954  -s ours am: eb7b7664cb am: 77852d0a9f  -s ours
  DO NOT MERGE: Move FakeSettingsProvider to a common location. am: b8df76e413  -s ours am: a84ede299c  -s ours am: 33b238bd42 am: 0c34c32534  -s ours
  DO NOT MERGE: ConnectivityServiceTest: mark flaky test as such am: 5d540d1410  -s ours am: e47b0886ad  -s ours am: 412e89fe9f am: 80587a02cc  -s ours
  DO NOT MERGE: Add option to skip and avoid captive portals. am: 1f64f3fd14  -s ours am: 8006bd5c66  -s ours am: 573880a198 am: c39a37c0d6  -s ours
  DO NOT MERGE: ApfFilter: use elapsedRealTime for RA lifetime am: dafc44ea11  -s ours am: d063978acf  -s ours am: 9c37634688 am: 52587963ca  -s ours
  DO NOT MERGE: Do not synchronize boolean reads/writes am: 94dcb3c3fd  -s ours am: eb98bc95d2  -s ours am: a63d5e5fd8 am: 9a686a26c6  -s ours
  DO NOT MERGE: ApfFilter: systematically use u8, u16, u32 getters am: 4104ff9220  -s ours am: 2889968553  -s ours am: 02f1650458 am: eaf63414bf  -s ours
  DO NOT MERGE: Add fuzzing tests to ApfFilter RA processing am: 0668a61d82  -s ours am: 976ef7538a  -s ours am: 046c5a3119 am: 796a0babf9  -s ours
  DO NOT MERGE: Support timeouts for requestNetwork() invocations. am: 3841a48d0a  -s ours am: eb6be2c826  -s ours am: e8dda0f7e4 am: cea7843c61  -s ours
  DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is specified for a given network. am: accd5fcb79  -s ours am: 8a73b2896d  -s ours am: a8500b7efc am: 59d46341c8  -s ours

This commit is contained in:

Android Build Merger (Role)

2016-12-08 18:00:30 +00:00

committed by

Android (Google) Code Review

parent d81a26353e e36404148e

commit fccade9ce9

Merge changes from topic 'am-53ce40f4d4244f45b19662f27574d289'

Diff Content Not Available