frameworks_base

Author	SHA1	Message	Date
Bill Yi	05ab7a37a4	Revert "Import translations. DO NOT MERGE" This reverts commit `52ae3289fb`. Change-Id: I629775ecf2470e8a16eb58df5cb1e8406865a6ba	2016-12-05 18:35:00 +00:00
Bill Yi	52ae3289fb	Import translations. DO NOT MERGE Change-Id: Ifb7cde4b8e869f98f49a2fb0270bc9cd30ed7b0d Auto-generated-cl: translation import	2016-12-03 00:20:58 -08:00
Tenghui Zhu	c6ee7e317f	Merge "Update the documentation related to VD / AVD" into nyc-mr2-dev	2016-12-02 22:25:04 +00:00
Jeff Sharkey	06f0764320	Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: `ae7d4b1339` -s ours am: `ce477912a2` am: `920b02a94f` -s ours am: `aff9286bd6` am: `37ff2d56bf` am: `56247334f8` am: `923aef8e02` -s ours am: `f199d511c3` am: `1d752340a7` am: `4aacfce724` am: `5b64f51a1c` Change-Id: I6434ed9331a3a34d15fb4628bf1979508de161b8	2016-12-02 20:37:55 +00:00
Jeff Sharkey	29e38b212f	DO NOT MERGE. Check provider access for content changes. am: `9b85862620` -s ours am: `9277cce7fa` am: `a1d1ecbe05` -s ours am: `928c09cd8e` am: `5267b63325` am: `a51ebb828a` am: `acfda3d71a` -s ours am: `0eaa192436` am: `43b3a13803` am: `6786309c03` am: `a43ee01a6d` Change-Id: I1a332bdc9c87dfe5f4d23d7aaa885bae5d7434bb	2016-12-02 20:36:51 +00:00
Jeff Sharkey	375f16eff4	Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: `6b89229d14` am: `a7efe16fe1` -s ours am: `f1085f2dc8` am: `c130d7fd5e` am: `948841362a` am: `7e54dc58d4` -s ours am: `3fa188bd8f` am: `09960bdfcc` am: `d12e48494d` am: `341813c852` Change-Id: Ia32a4880fc1c050122050099660d23322a51bbcc	2016-12-02 20:35:56 +00:00
Jeff Sharkey	00cc40c40a	DO NOT MERGE. Check provider access for content changes. am: `91add43ae7` am: `792d49dfb5` -s ours am: `32af84320b` am: `8b5fa0c0c0` am: `d081cb0ab7` am: `cd35e746dc` -s ours am: `836b54e6bb` am: `383e0cfa06` am: `a55258bd17` am: `2f48a6ce63` Change-Id: Ie9f87cf495bc3ffbdba03dc2ee5f2933790883d0	2016-12-02 20:35:06 +00:00
Jeff Sharkey	5b64f51a1c	Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: `ae7d4b1339` -s ours am: `ce477912a2` am: `920b02a94f` -s ours am: `aff9286bd6` am: `37ff2d56bf` am: `56247334f8` am: `923aef8e02` -s ours am: `f199d511c3` am: `1d752340a7` am: `4aacfce724` Change-Id: I954a47982a94c14abeeee205015423b9d6c19cea	2016-12-02 20:20:39 +00:00
Jeff Sharkey	a43ee01a6d	DO NOT MERGE. Check provider access for content changes. am: `9b85862620` -s ours am: `9277cce7fa` am: `a1d1ecbe05` -s ours am: `928c09cd8e` am: `5267b63325` am: `a51ebb828a` am: `acfda3d71a` -s ours am: `0eaa192436` am: `43b3a13803` am: `6786309c03` Change-Id: Ie17a80be06549016951ff91792586e1dc2e004cc	2016-12-02 20:19:28 +00:00
Jeff Sharkey	341813c852	Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: `6b89229d14` am: `a7efe16fe1` -s ours am: `f1085f2dc8` am: `c130d7fd5e` am: `948841362a` am: `7e54dc58d4` -s ours am: `3fa188bd8f` am: `09960bdfcc` am: `d12e48494d` Change-Id: I32c59ff8fd27596728ba87180cdf8e0c06d0d6ba	2016-12-02 20:18:32 +00:00
Jeff Sharkey	2f48a6ce63	DO NOT MERGE. Check provider access for content changes. am: `91add43ae7` am: `792d49dfb5` -s ours am: `32af84320b` am: `8b5fa0c0c0` am: `d081cb0ab7` am: `cd35e746dc` -s ours am: `836b54e6bb` am: `383e0cfa06` am: `a55258bd17` Change-Id: Idc5bde3158245925645d1ab69115df561922a758	2016-12-02 20:17:33 +00:00
TreeHugger Robot	3eda32cc71	Merge changes from topic 'fast-bss-transition' into nyc-mr2-dev * changes: Add capability flag for 802.11r fast BSS transition Add constants for 802.11r	2016-12-02 20:14:11 +00:00
Jakub Pawlowski	c977c776c2	Merge changes from topic 'ble_oob_sc_mr2' into nyc-mr2-dev * changes: BLE OOB Pairing - parse address type (5/5) Fix Bluetooth OOB pairing not working for unseen devices Add LE Secure Connection data parsing (1/4)	2016-12-02 20:14:03 +00:00
Jeff Sharkey	4aacfce724	Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: `ae7d4b1339` -s ours am: `ce477912a2` am: `920b02a94f` -s ours am: `aff9286bd6` am: `37ff2d56bf` am: `56247334f8` am: `923aef8e02` -s ours am: `f199d511c3` am: `1d752340a7` Change-Id: Ie7b1d07a622a9b5be4e0d5d9b08b33b821b8e43a	2016-12-02 20:11:33 +00:00
Jeff Sharkey	6786309c03	DO NOT MERGE. Check provider access for content changes. am: `9b85862620` -s ours am: `9277cce7fa` am: `a1d1ecbe05` -s ours am: `928c09cd8e` am: `5267b63325` am: `a51ebb828a` am: `acfda3d71a` -s ours am: `0eaa192436` am: `43b3a13803` Change-Id: I5f4f250100c3b9f63149add16f0086c77ccdf7ca	2016-12-02 20:10:37 +00:00
Jeff Sharkey	d12e48494d	Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: `6b89229d14` am: `a7efe16fe1` -s ours am: `f1085f2dc8` am: `c130d7fd5e` am: `948841362a` am: `7e54dc58d4` -s ours am: `3fa188bd8f` am: `09960bdfcc` Change-Id: Ib66ff9a9e82f9ed3e7e291c0bcca1be9d4f38805	2016-12-02 20:09:34 +00:00
Jeff Sharkey	a55258bd17	DO NOT MERGE. Check provider access for content changes. am: `91add43ae7` am: `792d49dfb5` -s ours am: `32af84320b` am: `8b5fa0c0c0` am: `d081cb0ab7` am: `cd35e746dc` -s ours am: `836b54e6bb` am: `383e0cfa06` Change-Id: I231c3a499177db213b0406ea84e7ea3c224f132d	2016-12-02 20:08:37 +00:00
Jeff Sharkey	1d752340a7	Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: `ae7d4b1339` -s ours am: `ce477912a2` am: `920b02a94f` -s ours am: `aff9286bd6` am: `37ff2d56bf` am: `56247334f8` am: `923aef8e02` -s ours am: `f199d511c3` Change-Id: I990a5459cd64bbc0e2ede2d3b5899163d12818f4	2016-12-02 19:55:09 +00:00
Jeff Sharkey	43b3a13803	DO NOT MERGE. Check provider access for content changes. am: `9b85862620` -s ours am: `9277cce7fa` am: `a1d1ecbe05` -s ours am: `928c09cd8e` am: `5267b63325` am: `a51ebb828a` am: `acfda3d71a` -s ours am: `0eaa192436` Change-Id: Ie0fe9fd6770c94d56b3af10902c44c52d9a2f2a3	2016-12-02 19:54:12 +00:00
Jeff Sharkey	09960bdfcc	Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: `6b89229d14` am: `a7efe16fe1` -s ours am: `f1085f2dc8` am: `c130d7fd5e` am: `948841362a` am: `7e54dc58d4` -s ours am: `3fa188bd8f` Change-Id: Ibae31cd6439c2fdfcc9d333ca23bd466a7730218	2016-12-02 19:53:09 +00:00
Jeff Sharkey	383e0cfa06	DO NOT MERGE. Check provider access for content changes. am: `91add43ae7` am: `792d49dfb5` -s ours am: `32af84320b` am: `8b5fa0c0c0` am: `d081cb0ab7` am: `cd35e746dc` -s ours am: `836b54e6bb` Change-Id: Ib546b18b5373aaf8e429a3e8668a23a9d3b5c411	2016-12-02 19:52:04 +00:00
Jeff Sharkey	1157adb305	Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: `8e14278209` am: `a80cbeeee2` am: `44e8914f8b` am: `26f78f5836` -s ours am: `99b97e5ed1` am: `398cdb6929` am: f00515f4d9" into cw-f-dev am: `2e73db5b9c` Change-Id: I0d230d279eb3fad10e46dbb3c469d770a80482e8	2016-12-02 19:51:21 +00:00
Jeff Sharkey	9ce28af49c	Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: `8e14278209` am: `a80cbeeee2` am: `44e8914f8b` am: `26f78f5836` -s ours am: `99b97e5ed1` am: `398cdb6929` am: `f00515f4d9` am: `17d6ba41b8` Change-Id: Idb7d2abaaf9809afd070e012dca6988ced2bf22c	2016-12-02 19:47:38 +00:00
Jeff Sharkey	f199d511c3	Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: `ae7d4b1339` -s ours am: `ce477912a2` am: `920b02a94f` -s ours am: `aff9286bd6` am: `37ff2d56bf` am: `56247334f8` am: `923aef8e02` -s ours Change-Id: Ia0d0ac5ed1f8a84bd9158530fde499f91ac7f411	2016-12-02 19:46:36 +00:00
Jeff Sharkey	f196c044f3	Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: `8e14278209` am: `a80cbeeee2` am: `44e8914f8b` am: `26f78f5836` -s ours am: `99b97e5ed1` am: `398cdb6929` am: `f00515f4d9` am: `5bf382063d` Change-Id: Ibef588aa9d1b61c31bb2c0ecfada658ed2574981	2016-12-02 19:46:22 +00:00
Jeff Sharkey	0eaa192436	DO NOT MERGE. Check provider access for content changes. am: `9b85862620` -s ours am: `9277cce7fa` am: `a1d1ecbe05` -s ours am: `928c09cd8e` am: `5267b63325` am: `a51ebb828a` am: `acfda3d71a` -s ours Change-Id: I0857c3cdd2e471ad04dbafc22a7898168a615a24	2016-12-02 19:45:33 +00:00
Jeff Sharkey	d01f22d0b2	DO NOT MERGE: Check provider access for content changes. am: `4ddbf942a0` am: `190e20c2b5` am: `74b36307a0` am: `4ad177829a` -s ours am: `c067e76bba` am: `0891ca2fad` am: `12b2f8a275` am: `71e4281969` Change-Id: I61d48d60faa4b8a7e06a72df277f5f2a5180de92	2016-12-02 19:45:19 +00:00
Jeff Sharkey	3fa188bd8f	Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: `6b89229d14` am: `a7efe16fe1` -s ours am: `f1085f2dc8` am: `c130d7fd5e` am: `948841362a` am: `7e54dc58d4` -s ours Change-Id: I3dce2baad70e1d9d606c27534f4ff4e9435f2445	2016-12-02 19:44:38 +00:00
Jeff Sharkey	b46e9bb9cb	Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: `48f6bdfce4` am: `471812ad04` am: `4610805746` -s ours am: `aeeb9c8470` am: `8c74832d5e` am: `07ad2a9063` am: `a75ce3a705` Change-Id: Ic4004d4923cc544a4babc457bc5cdb024bc9ee51	2016-12-02 19:44:25 +00:00
Jeff Sharkey	836b54e6bb	DO NOT MERGE. Check provider access for content changes. am: `91add43ae7` am: `792d49dfb5` -s ours am: `32af84320b` am: `8b5fa0c0c0` am: `d081cb0ab7` am: `cd35e746dc` -s ours Change-Id: I12608bbd9173dc053df967174bc59f9297a151c2	2016-12-02 19:43:33 +00:00
Jeff Sharkey	dd09c12a61	DO NOT MERGE: Check provider access for content changes. am: `ff2fede0dd` am: `7340749c2a` am: `a07bcbcc27` -s ours am: `e0fe3201cb` am: `8165a22f53` am: `270d1c27ac` am: `10cdb1130e` Change-Id: Idfe644ae174419c698987de336e072208468866f	2016-12-02 19:43:28 +00:00
Android Build Merger (Role)	2e73db5b9c	Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: `8e14278209` am: `a80cbeeee2` am: `44e8914f8b` am: `26f78f5836` -s ours am: `99b97e5ed1` am: `398cdb6929` am: f00515f4d9" into cw-f-dev	2016-12-02 19:33:12 +00:00
Jeff Sharkey	17d6ba41b8	Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: `8e14278209` am: `a80cbeeee2` am: `44e8914f8b` am: `26f78f5836` -s ours am: `99b97e5ed1` am: `398cdb6929` am: `f00515f4d9` Change-Id: I667f20343f23366c2530a5ea658a5414c45f2799	2016-12-02 19:32:36 +00:00
Jeff Sharkey	923aef8e02	Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: `ae7d4b1339` -s ours am: `ce477912a2` am: `920b02a94f` -s ours am: `aff9286bd6` am: `37ff2d56bf` am: `56247334f8` Change-Id: I8bf5769fbb68fb10a4acd2c557dc1c66a3c448df	2016-12-02 19:29:15 +00:00
Jeff Sharkey	5bf382063d	Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: `8e14278209` am: `a80cbeeee2` am: `44e8914f8b` am: `26f78f5836` -s ours am: `99b97e5ed1` am: `398cdb6929` am: `f00515f4d9` Change-Id: Iafa9dd90fe36a10d781d92d236faa671178b2737	2016-12-02 19:29:14 +00:00
Jeff Sharkey	acfda3d71a	DO NOT MERGE. Check provider access for content changes. am: `9b85862620` -s ours am: `9277cce7fa` am: `a1d1ecbe05` -s ours am: `928c09cd8e` am: `5267b63325` am: `a51ebb828a` Change-Id: Ic67fac2e28ab776632a98e3556c46826d7335a91	2016-12-02 19:28:18 +00:00
Jeff Sharkey	71e4281969	DO NOT MERGE: Check provider access for content changes. am: `4ddbf942a0` am: `190e20c2b5` am: `74b36307a0` am: `4ad177829a` -s ours am: `c067e76bba` am: `0891ca2fad` am: `12b2f8a275` Change-Id: I5d2e9c9faa81ddc2c1f29d10aaa8ef7567209969	2016-12-02 19:28:14 +00:00
Jeff Sharkey	a75ce3a705	Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: `48f6bdfce4` am: `471812ad04` am: `4610805746` -s ours am: `aeeb9c8470` am: `8c74832d5e` am: `07ad2a9063` Change-Id: Ia05929a5edcc75490d8388008380d5db8f7edc85	2016-12-02 19:27:26 +00:00
Jeff Sharkey	7e54dc58d4	Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: `6b89229d14` am: `a7efe16fe1` -s ours am: `f1085f2dc8` am: `c130d7fd5e` am: `948841362a` Change-Id: I66fdc5fb2ca169453b6b2f5dc7d6c10360aea709	2016-12-02 19:27:23 +00:00
Jeff Sharkey	10cdb1130e	DO NOT MERGE: Check provider access for content changes. am: `ff2fede0dd` am: `7340749c2a` am: `a07bcbcc27` -s ours am: `e0fe3201cb` am: `8165a22f53` am: `270d1c27ac` Change-Id: I426e531fd2fda1e09276dcfdc774fb548eedbefd	2016-12-02 19:26:31 +00:00
Jeff Sharkey	cd35e746dc	DO NOT MERGE. Check provider access for content changes. am: `91add43ae7` am: `792d49dfb5` -s ours am: `32af84320b` am: `8b5fa0c0c0` am: `d081cb0ab7` Change-Id: I3fc3458a9050e1ee9cb57b9348d67ccd3ce71037	2016-12-02 19:26:28 +00:00
Jeff Sharkey	f00515f4d9	Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: `8e14278209` am: `a80cbeeee2` am: `44e8914f8b` am: `26f78f5836` -s ours am: `99b97e5ed1` am: `398cdb6929` Change-Id: I40a0cb7f416d843b12893656d16dfed97d0df058	2016-12-02 19:21:21 +00:00
Jeff Sharkey	12b2f8a275	DO NOT MERGE: Check provider access for content changes. am: `4ddbf942a0` am: `190e20c2b5` am: `74b36307a0` am: `4ad177829a` -s ours am: `c067e76bba` am: `0891ca2fad` Change-Id: I2e9897c052ee296d68beb50b6ac927e5a0d92daa	2016-12-02 19:20:23 +00:00
Jeff Sharkey	07ad2a9063	Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: `48f6bdfce4` am: `471812ad04` am: `4610805746` -s ours am: `aeeb9c8470` am: `8c74832d5e` Change-Id: I35d8c2faba5a6f359bbe51b56052bafe90a6cac1	2016-12-02 19:19:29 +00:00
Jeff Sharkey	270d1c27ac	DO NOT MERGE: Check provider access for content changes. am: `ff2fede0dd` am: `7340749c2a` am: `a07bcbcc27` -s ours am: `e0fe3201cb` am: `8165a22f53` Change-Id: Iee87f3c3d384bf785b3c6c877a817c35bbdb478b	2016-12-02 19:18:31 +00:00
Jeff Sharkey	56247334f8	Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: `ae7d4b1339` -s ours am: `ce477912a2` am: `920b02a94f` -s ours am: `aff9286bd6` am: `37ff2d56bf` Change-Id: I0ff63a0da9300799a8df538fcefaf0d27ea2be00	2016-12-02 19:13:31 +00:00
Jeff Sharkey	a51ebb828a	DO NOT MERGE. Check provider access for content changes. am: `9b85862620` -s ours am: `9277cce7fa` am: `a1d1ecbe05` -s ours am: `928c09cd8e` am: `5267b63325` Change-Id: I3cab573840604be9c44e85998c4b1a579d07aee4	2016-12-02 19:12:33 +00:00
Jeff Sharkey	398cdb6929	Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: `8e14278209` am: `a80cbeeee2` am: `44e8914f8b` am: `26f78f5836` -s ours am: `99b97e5ed1` Change-Id: I1812de0dd036142fae97145361fdf5da50e61536	2016-12-02 19:12:00 +00:00
Jeff Sharkey	948841362a	Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: `6b89229d14` am: `a7efe16fe1` -s ours am: `f1085f2dc8` am: `c130d7fd5e` Change-Id: I15e9c5f864ec67c8bf5901fcc46abe0c7b362a6e	2016-12-02 19:11:29 +00:00
Jeff Sharkey	0891ca2fad	DO NOT MERGE: Check provider access for content changes. am: `4ddbf942a0` am: `190e20c2b5` am: `74b36307a0` am: `4ad177829a` -s ours am: `c067e76bba` Change-Id: I36e17906c43408126d1acabde89bf7ec04e16aab	2016-12-02 19:10:36 +00:00

1 2 3 4 5 ...

257328 Commits