Commit Graph

277484 Commits

Author SHA1 Message Date
Ajay Panicker
48f906c852 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours am: 2ef2d90eaa am: b2e8361c50 am: c147db7a79 am: 3e238e3396 -s ours am: 998001b4b2
am: d9421e7758

Change-Id: Ifd0e426285b9242ed9b0a1c3f72d82bad8fc9e02
2016-09-21 04:14:26 +00:00
Elliot Waite
dd7dc1fdfe Merge "Fix some at links." into nyc-dev am: edc31f9593 am: 7072b952c8
am: 00be401c1d

Change-Id: I3221f5ac3e141cdb8379c41ebc64b6d10ff4bc19
2016-09-21 04:14:16 +00:00
Ajay Panicker
e053061edd Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc -s ours am: 3a20f7ceac am: be2651bb6b am: a7176293fd
am: e60aa74d44  -s ours

Change-Id: Id0fe233f9b700c7b41fe864699b54727108b6ecf
2016-09-21 04:13:46 +00:00
Ajay Panicker
c96f655395 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324 -s ours am: dcb78c9cf1 am: 3ed9e7693d am: 853e39d3d9 am: 232824e01c -s ours
am: 257cf16de3

Change-Id: I1677fdf4dcfe9fe96de22f4cdfb67225b4d86a2e
2016-09-21 04:13:25 +00:00
Elliot Waite
4b332ffd9f Fix some at links. am: 28d87163e1 am: f3bbfdaf9d
am: 5c8bd2598d

Change-Id: I2fa802d2e0db99ca0abe2cb3f3ac98c0b5aa9bb5
2016-09-21 04:13:16 +00:00
Ajay Panicker
2040a257a8 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours am: 2ef2d90eaa am: b2e8361c50 am: c147db7a79 am: 3e238e3396 -s ours am: 998001b4b2
am: 04ff2b888b

Change-Id: Id379950f8915de393c76d1a8af498323eecb8a98
2016-09-21 04:12:42 +00:00
Ajay Panicker
a33da80306 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55 am: a701b1b6f6 -s ours am: afafdff50e am: d46605ab09 am: fc7822f58a am: 93a622150f -s ours am: 834f982c97
am: 51c046dae8

Change-Id: I2c10dde1ac9c511ed21d7a7b2e97d1f7de4d9d0e
2016-09-21 04:12:11 +00:00
Ajay Panicker
7b1071b35b [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55 am: a701b1b6f6 -s ours am: afafdff50e am: d46605ab09 am: fc7822f58a am: 93a622150f -s ours am: 834f982c97
am: af280fb4c1

Change-Id: I299e2ed9a34061721634640fc9abf2d9677edda3
2016-09-21 04:10:34 +00:00
Ajay Panicker
e60aa74d44 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc -s ours am: 3a20f7ceac am: be2651bb6b
am: a7176293fd

Change-Id: I480a3e8cfc363570ecb10d5cca2b0e1a95472f51
2016-09-21 04:02:02 +00:00
Ajay Panicker
c061dcda05 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours am: 6b16f71975 am: dddb99f020 am: cdf3126615 am: bd752f7d88 -s ours
am: da12b4b0f0

Change-Id: I2a86abe82aada0a2a965a8eebdecbd7d72d1a61c
2016-09-21 04:00:14 +00:00
Ajay Panicker
2828cb3246 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324 -s ours am: dcb78c9cf1 am: 3ed9e7693d am: 853e39d3d9 am: 232824e01c -s ours
am: 257cf16de3

Change-Id: Id2ba962d9bb6341fab608b8c19fe295c7bddaaa8
2016-09-21 03:52:52 +00:00
Ajay Panicker
eb431d8161 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4 am: ef74f3b079 -s ours am: 0f464f9d77 am: 1682f67177 am: 13ac17ab3a am: ec220f645f -s ours
am: e460ea15e6

Change-Id: I13e1a58832d60fb8b89c8cc32f51de3dc5e19210
2016-09-21 03:50:33 +00:00
Ajay Panicker
04ff2b888b Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours am: 2ef2d90eaa am: b2e8361c50 am: c147db7a79 am: 3e238e3396 -s ours
am: 998001b4b2

Change-Id: Idce49a38c881ce3b41e29e01665b1b0135bd76f5
2016-09-21 03:48:17 +00:00
Android Build Merger (Role)
ac37c4ec36 Merge "Merge "Listen to ACTION_UID_REMOVED only. DO NOT MERGE." into nyc-mr1-dev am: 1bae4e3e17 am: 0e4b6eb3fd" into nyc-mr1-dev-plus-aosp 2016-09-21 03:46:33 +00:00
Android Build Merger (Role)
f67caf5fa9 Merge "Merge "Fix some at links." into nyc-dev am: edc31f9593 am: 2b5e6d1551" into nyc-mr1-dev-plus-aosp 2016-09-21 03:46:12 +00:00
Felipe Leme
10b862999b Merge "Listen to ACTION_UID_REMOVED only. DO NOT MERGE." into nyc-mr1-dev am: 1bae4e3e17
am: 0e4b6eb3fd

Change-Id: I4e08d5b26514b9b9e7482073623a930bc1fcc830
2016-09-21 03:45:36 +00:00
Ajay Panicker
af280fb4c1 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55 am: a701b1b6f6 -s ours am: afafdff50e am: d46605ab09 am: fc7822f58a am: 93a622150f -s ours
am: 834f982c97

Change-Id: Ied7524231b911717f832c226b5cda10c53275fb7
2016-09-21 03:45:35 +00:00
Elliot Waite
0ed2d70bb7 Merge "Fix some at links." into nyc-dev am: edc31f9593
am: 2b5e6d1551

Change-Id: Id50d30d97a692b9215dc2a1129e15010cbc59464
2016-09-21 03:45:20 +00:00
Android Build Merger (Role)
30834dbf54 Merge "Listen to ACTION_UID_REMOVED only. DO NOT MERGE. am: f1da90fe04 am: b63481d64c" into nyc-mr1-dev-plus-aosp 2016-09-21 03:45:18 +00:00
Felipe Leme
114052549b Listen to ACTION_UID_REMOVED only. DO NOT MERGE. am: f1da90fe04
am: b63481d64c

Change-Id: I811a94ec8906e83c235c84952f64c741a1f6e72e
2016-09-21 03:44:34 +00:00
Elliot Waite
90fed505ae Fix some at links. am: 28d87163e1
am: 13145b6f9a

Change-Id: I3e0108bdaa9dc3452251d2cdf0a709ad9e2825b6
2016-09-21 03:44:22 +00:00
Ajay Panicker
a7176293fd Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc -s ours am: 3a20f7ceac
am: be2651bb6b

Change-Id: I7ffc9b61fbfe670a68049b94a05415abec38e36e
2016-09-21 03:44:15 +00:00
Ajay Panicker
b9cfbef8db [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4 am: ef74f3b079 -s ours am: 0f464f9d77 am: 1682f67177 am: 13ac17ab3a am: ec220f645f -s ours
am: e460ea15e6

Change-Id: I37c93b23735ea728ce5cfd77ae930f6834a6cfe5
2016-09-21 03:30:43 +00:00
Ajay Panicker
d9421e7758 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours am: 2ef2d90eaa am: b2e8361c50 am: c147db7a79 am: 3e238e3396 -s ours
am: 998001b4b2

Change-Id: I3fa54c60c1172c2e934fa8887413c3767f82e6d6
2016-09-21 03:27:48 +00:00
Ajay Panicker
da12b4b0f0 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours am: 6b16f71975 am: dddb99f020 am: cdf3126615
am: bd752f7d88  -s ours

Change-Id: I5657111479e2ac6df3f856c7a624421e37ec731d
2016-09-21 03:26:15 +00:00
Elliot Waite
2b5e6d1551 Merge "Fix some at links." into nyc-dev
am: edc31f9593

Change-Id: I0a4fa551123a46f3de8323deca72f6582ecba33a
2016-09-21 03:26:01 +00:00
Elliot Waite
13145b6f9a Fix some at links.
am: 28d87163e1

Change-Id: Ibaa18eee9bf406eccda03e3b5425f72b8fb51037
2016-09-21 03:25:49 +00:00
Ajay Panicker
51c046dae8 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55 am: a701b1b6f6 -s ours am: afafdff50e am: d46605ab09 am: fc7822f58a am: 93a622150f -s ours
am: 834f982c97

Change-Id: I01516b02b44a32a1f140143ef118f623905fca1e
2016-09-21 03:25:07 +00:00
Ajay Panicker
be2651bb6b Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc -s ours
am: 3a20f7ceac

Change-Id: I10c29e499b19e247dedc4e65b3d1d4bd42a7eb03
2016-09-21 03:23:38 +00:00
Ajay Panicker
257cf16de3 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324 -s ours am: dcb78c9cf1 am: 3ed9e7693d am: 853e39d3d9
am: 232824e01c  -s ours

Change-Id: Ic4636b08ecc94720c7b013769436668167b6fca8
2016-09-21 03:17:36 +00:00
Ajay Panicker
e460ea15e6 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4 am: ef74f3b079 -s ours am: 0f464f9d77 am: 1682f67177 am: 13ac17ab3a
am: ec220f645f  -s ours

Change-Id: If90aff1167803a965e938f9e174ec1df09401b85
2016-09-21 03:15:14 +00:00
Marie Janssen
fc0534d088 Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323 am: e4f60787f3 am: ce8032ebbb am: 0ed17e5c8d am: 9013d67f0c am: 7e5b9e3d32 am: 32ae78598d
am: f01ea8810f

Change-Id: If6c8ab5479b950eb7473edfe8d5ed2a02beeb865
2016-09-21 03:14:07 +00:00
Ajay Panicker
998001b4b2 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours am: 2ef2d90eaa am: b2e8361c50 am: c147db7a79
am: 3e238e3396  -s ours

Change-Id: I52e1cfccc31b8169eaeb4e4aacc67b97b0e39cec
2016-09-21 03:13:20 +00:00
Elliot Waite
00be401c1d Merge "Fix some at links." into nyc-dev am: edc31f9593
am: 7072b952c8

Change-Id: I379a5a75cc2fc85a1520ea45b3e1cbd0674ad199
2016-09-21 03:12:54 +00:00
Marie Janssen
570dd2c9b4 Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048 am: 532d2b11a3 am: 6f514cc82b am: 5742a055e2 am: bf11fae04e
am: 7247c4931d

Change-Id: Ia5a750eab904baebf042b43ef5eb8f63d99f1881
2016-09-21 03:12:23 +00:00
Ajay Panicker
bd752f7d88 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours am: 6b16f71975 am: dddb99f020
am: cdf3126615

Change-Id: I37fdf0eb48bd07dc07b8716040d2f286304bce70
2016-09-21 03:12:09 +00:00
Ajay Panicker
834f982c97 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55 am: a701b1b6f6 -s ours am: afafdff50e am: d46605ab09 am: fc7822f58a
am: 93a622150f  -s ours

Change-Id: If89cb759ef536ee618a3ab6121fde4e3dbc6dac3
2016-09-21 03:12:02 +00:00
Elliot Waite
5c8bd2598d Fix some at links. am: 28d87163e1
am: f3bbfdaf9d

Change-Id: I6f0e9b8702c4a09bbe3c752077a8d9e164c61d2e
2016-09-21 03:11:58 +00:00
Doris Liu
444484e485 Merge "Improve Javadoc for AnimatedVectorDrawable" into nyc-mr1-dev am: 85973e91d2
am: ef2dafbbe4

Change-Id: I96ba5e572739fc3196feb7e558e407807363d6bc
2016-09-21 03:11:17 +00:00
Ajay Panicker
3a20f7ceac Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5
am: fe616288dc  -s ours

Change-Id: I858b0c0f7d1b9e723857169bd7f29a55d82e0136
2016-09-21 03:10:15 +00:00
Felipe Leme
0e4b6eb3fd Merge "Listen to ACTION_UID_REMOVED only. DO NOT MERGE." into nyc-mr1-dev
am: 1bae4e3e17

Change-Id: I7e0677a20b59ef8449ec2318292cf7afff7c5115
2016-09-21 03:09:16 +00:00
Felipe Leme
b63481d64c Listen to ACTION_UID_REMOVED only. DO NOT MERGE.
am: f1da90fe04

Change-Id: I6a555cc1572add73e467a829271909aade5ca1e3
2016-09-21 03:09:13 +00:00
Marie Janssen
f01ea8810f Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323 am: e4f60787f3 am: ce8032ebbb am: 0ed17e5c8d am: 9013d67f0c am: 7e5b9e3d32
am: 32ae78598d

Change-Id: I8125e8c8d043d1b9a7e41ce4aaa829dd0427ca23
2016-09-21 02:57:35 +00:00
Ajay Panicker
cdf3126615 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours am: 6b16f71975
am: dddb99f020

Change-Id: Ie45bd66830e6e3e68be7e3f2692911ea4fa82fa9
2016-09-21 02:56:53 +00:00
Doris Liu
ab4f8f2f1d Improve Javadoc for AnimatedVectorDrawable am: 7d76fc4433
am: f6088e45e0

Change-Id: I8124dbe734afc7d1876e2228aad69a653fb3e469
2016-09-21 02:56:51 +00:00
Marie Janssen
7247c4931d Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048 am: 532d2b11a3 am: 6f514cc82b am: 5742a055e2
am: bf11fae04e

Change-Id: I872dcd022b298f3f441a9d2315b3ec967e0af5bd
2016-09-21 02:56:01 +00:00
Ajay Panicker
fe616288dc Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485
am: 95b604ccb5

Change-Id: I78d80c17e2b7a0b6d0d611f738a3b880dd74dab0
2016-09-21 02:55:36 +00:00
Ajay Panicker
232824e01c Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324 -s ours am: dcb78c9cf1 am: 3ed9e7693d
am: 853e39d3d9

Change-Id: I1f1f4f44161525bb4ee7fbbcabdd5a6e346d3b8a
2016-09-21 02:54:19 +00:00
TreeHugger Robot
1bae4e3e17 Merge "Listen to ACTION_UID_REMOVED only. DO NOT MERGE." into nyc-mr1-dev 2016-09-21 02:46:08 +00:00
Ajay Panicker
ec220f645f [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4 am: ef74f3b079 -s ours am: 0f464f9d77 am: 1682f67177
am: 13ac17ab3a

Change-Id: I495579b3cca396dd5fb6a628bedb5e5be4916b26
2016-09-21 02:40:31 +00:00