291028 Commits

Author SHA1 Message Date
Etan Cohen
8332931311 [NAN] Update API javadoc to clarify NAN status change broadcast scope am: 4c22e8bede am: c3066c1d68 am: 4cb72b6125
am: 234039affa

Change-Id: Ifc17620907d779f4ad5a8b9c031f476c3e48f8c2
2016-10-01 00:02:12 +00:00
Tao Bao
a2108434fd Merge "Handle the race condition when calling uncrypt services." am: 42d25b5992 am: 86df8ecdf3 am: ade17dea88
am: 2a327506cf

Change-Id: I29cc6009fcd4d58a2f11adba425a6dafeeecb4ab
2016-10-01 00:01:03 +00:00
Cheryl Potter
3cd6fd9ed6 Merge "docs: help button redirects, see go/AS-help-buttons b/31810305" into nyc-dev am: c14495eb9a am: c6845ca160 am: 38652db818 am: 96b7987b14
am: 0a97ad6fb0

Change-Id: Ic9356d57f35074903b5e5fd8184a1bf683b17c1d
2016-09-30 23:59:56 +00:00
Cheryl Potter
18b7703aee docs: help button redirects, see go/AS-help-buttons b/31810305 am: 27d595a5e4 am: 53e56f7331 am: 771703e195 am: 3b78cd86bf
am: 58db78bfbd

Change-Id: I267786284159c136978d17d6108f991e3dd58b85
2016-09-30 23:58:34 +00:00
Cheryl Potter
d3c5caceba Merge "docs: help button redirects, see go/AS-help-buttons b/31810305" into nyc-dev am: c14495eb9a am: aa36af0287
am: f02d8ec4cd

Change-Id: I54d2125c1c578784c633620e3c279341a3cac70b
2016-09-30 23:57:25 +00:00
Cheryl Potter
519f7d3899 docs: help button redirects, see go/AS-help-buttons b/31810305 am: 27d595a5e4 am: b31f82f82b
am: 26f475000d

Change-Id: I6d4505b93fc4d96942ec36fddf0918594d4cf760
2016-09-30 23:56:13 +00:00
Joe Fernandez
abc88a810b Merge "Docs: Added info about vector drawable" into nyc-dev am: a86fbb9c83 am: d99744e99e am: f2461b7e67 am: ff7aa7fd88
am: 25df4c4602

Change-Id: Iaf340cbbb6a2dbcc20371acd8645ab6d1b95ecde
2016-09-30 23:55:05 +00:00
Hemal Patel
0673319ac5 Docs: Added info about vector drawable am: 47876e79de am: bfa9663e97 am: da400e9dd4 am: 28529d5989
am: bf94f838f4

Change-Id: I494b98287b6845a5eb22ce83bdde518db255c1b2
2016-09-30 23:53:52 +00:00
Joe Fernandez
3e259de171 Merge "Docs: Added info about vector drawable" into nyc-dev am: a86fbb9c83 am: 7e1b38cf6c
am: 51eea7e37a

Change-Id: Iefc8aab3d9ec52b3994c912fff0bfecfaf3b0757
2016-09-30 23:52:37 +00:00
Hemal Patel
c5d6e74dff Docs: Added info about vector drawable am: 47876e79de am: f1f89fa935
am: d0cff7a3af

Change-Id: If20b595f5b278c81afd0f3b263566ea11ad4a67f
2016-09-30 23:51:18 +00:00
Jordan Liu
894da5acb9 Merge "Add config_carrier_wfc_ims_available to config.xml" am: d1d682e446 am: 4fe680f920 am: 0af8ddf661
am: 456edab6e5

Change-Id: I2339f2d669aaa756f26d0843bf1a3c85cb7a9656
2016-09-30 23:50:02 +00:00
Bill Yi
1ded64047d Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: d65fc69f4e -s ours am: 69f203705b -s ours am: 4a61fdc057 -s ours
am: 67a94b83de  -s ours

Change-Id: I42b3e1cf49b2e1f900673a32f9756bfeb0678842
2016-09-30 23:48:41 +00:00
Bill Yi
84c10a3ccb Import translations. DO NOT MERGE am: 780931dd46 -s ours am: 5c7aa32ff3 -s ours am: 84f86ec99c -s ours
am: d748c97e7e  -s ours

Change-Id: I976103d99210f7b8fed82729307f13ce5297751a
2016-09-30 23:47:29 +00:00
Jason Monk
523f8ea241 Merge "QS: Fix RTL handling for listening" into nyc-mr1-dev am: 1b7e4b445f am: e21c1d3f44
am: f099bf3b98

Change-Id: I078c0337ecedb692d376f0f416fa76ee54a95b50
2016-09-30 23:46:29 +00:00
Jason Monk
c576332f82 QS: Fix RTL handling for listening am: 69dac2b45b am: e4e5e1a273
am: 0163bc2b99

Change-Id: I7eb645e3d8bf3e7e154419365be3efd763062043
2016-09-30 23:45:14 +00:00
Eric Schmidt
f74cd05518 Merge "Merge "docs: Broken at link in Memory article. am: 0046284c0f" into nyc-dev am: 64d0b4510d am: 76ae4deb63" into nyc-mr1-dev am: d0e0aea316 am: 2e893e9834
am: b6b5ed5bf8

Change-Id: I14bfed23292f65be8d52b40fde44835549b2d6af
2016-09-30 23:44:02 +00:00
Eric Schmidt
f815b29ed5 Merge "docs: Broken at link in Memory article. am: 0046284c0f" into nyc-dev am: 64d0b4510d am: 76ae4deb63 am: 3ed4461219 am: 2e8f17ad11
am: 7d2b16ef9d

Change-Id: I1c29ad3ef23769cd6e05b2c1b4ae86e14f95bc8c
2016-09-30 23:42:43 +00:00
Eric Schmidt
88bba77928 Merge "docs: Broken at link in Memory article. am: 0046284c0f am: 9b91c3ec73 am: b6a21f7617" into nyc-mr1-dev am: 9b65b829cd am: ea10cc4c1a
am: d53fcb0fe1

Change-Id: I3cd7021cf24b78538f7faf57c6ff43bbb1f0b304
2016-09-30 23:41:31 +00:00
Eric Schmidt
37bc19750c docs: Broken at link in Memory article. am: 0046284c0f am: 9b91c3ec73 am: b6a21f7617 am: 5094fc6912 am: 76f9b49d22
am: 2651fa9d85

Change-Id: I82caeaf19f9d4fe59ed0f56cecf6d52640ec702f
2016-09-30 23:40:08 +00:00
Bill Yi
21a5009244 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: decbebd3d5 -s ours am: 75f0aab3b5 -s ours
am: f9187127f2  -s ours

Change-Id: I0362d7dab794f22a1849a5c515f456b3a46dff24
2016-09-30 23:39:06 +00:00
Bill Yi
5814b90fd9 Import translations. DO NOT MERGE am: b773807759 -s ours am: 3e41e1f7f0 -s ours
am: 5679cf97b7  -s ours

Change-Id: Ib3ae62c39a70d80bc4a5e73a72ec2508859e14fb
2016-09-30 23:37:45 +00:00
Sreevani Sreejith
b558bae2eb Merge "docs: Updated wording on auto playback app requirement." into nyc-dev am: f8c8a636d2 am: 4df99e77af am: 8102f26b51 am: c754436fcc
am: 4057537be4

Change-Id: Id5ffd957ae629aa11675b2ca91085910e089b5e2
2016-09-30 23:36:40 +00:00
sreevanis
06a1def893 docs: Updated wording on auto playback app requirement. am: d4fa870a6a am: 072d47bf61 am: 2bffdff716 am: c7ad77a05a
am: a025bee0cc

Change-Id: I33d4f977ee1597ef1958c2429b30bcfe439cb674
2016-09-30 23:35:34 +00:00
Randy Pan
8df48706cb Merge "Merge "Remove the obsoleted ScanResult.isAutoJoinCandidate" am: 673b47f234 am: 63224d9ea3" into nyc-dev-plus-aosp am: 6cfbdf11dd
am: 63fc17c0b1

Change-Id: If03d8f0ce04357e412f1a1faa81e68da22d9b4a1
2016-09-30 23:34:30 +00:00
Randy Pan
678b928a4a Merge "Remove the obsoleted ScanResult.isAutoJoinCandidate" am: 673b47f234 am: 63224d9ea3 am: 3629b4eddf
am: 8f41a28f21

Change-Id: I87889b34c0fbc5c00411ce2409bbd10a99d4fbe8
2016-09-30 23:29:49 +00:00
Eric Schmidt
6bba3387ef Merge "docs: Broken at link in Memory article. am: 0046284c0f" into nyc-dev am: 64d0b4510d am: c6b19af30d
am: ccb5f84092

Change-Id: Ic115a9d77347a57c0b9138456c7725bf726bbfd6
2016-09-30 23:24:03 +00:00
Eric Schmidt
744fd1bd01 docs: Broken at link in Memory article. am: 0046284c0f am: 9b91c3ec73 am: 62ec0a6b85
am: adb37ddbcc

Change-Id: I50f41367a596de7237fb8d5cfad32a67ba89c348
2016-09-30 23:22:58 +00:00
Sreevani Sreejith
81f1ec8bfb Merge "docs: Updated wording on auto playback app requirement." into nyc-dev am: f8c8a636d2 am: 2a3047bc11
am: de12b422f6

Change-Id: If434d9324bbe40ff56a9dfe50aac2951dfc37973
2016-09-30 23:22:00 +00:00
sreevanis
087668ef0c docs: Updated wording on auto playback app requirement. am: d4fa870a6a am: fcd5479286
am: 7dbe53475c

Change-Id: I08991c4ff958cf58bffd8c00c5d9518db5add478
2016-09-30 23:20:50 +00:00
Selim Cinek
559ad11f86 Merge "Fixed a bug with the scrollability of notifications" into nyc-mr1-dev am: a09cae745e am: 19b4731957
am: 348b6b9a7f

Change-Id: I47eedf99607a649e38b2b02498b6af8cec7d9d2d
2016-09-30 23:19:45 +00:00
Selim Cinek
6397f7ccd9 Fixed a bug with the scrollability of notifications am: ef40606eb9 am: 89fc993a74
am: 6e839177cc

Change-Id: I94cbe73e71f3688e1d41985bc255af2cca2f91fe
2016-09-30 23:18:42 +00:00
Jason Monk
df73e1c8c3 Merge "Fix talkback reading battery 0% on boot" into nyc-mr1-dev am: 5e96460698 am: 4e751db0cf
am: d36382a590

Change-Id: If5d5232b06d68e902abef5b9a97745e351146c65
2016-09-30 23:17:41 +00:00
Jason Monk
940fbb3548 Fix talkback reading battery 0% on boot am: 159dfb78e9 am: 0df0546ea9
am: d6c2761dea

Change-Id: I42e526ed0bd7d6cb049879ac5b0bf11c45dc5c7f
2016-09-30 23:16:35 +00:00
Joe Fernandez
fb36a3341b Merge "docs: Fixed attribute mismatch between XML and Java code samples for a "Clip" drawable." into nyc-dev am: 356348d9e8 am: f82e43467e am: b627a684a5 am: f322f000a3
am: e0d7e6061a

Change-Id: I634241e1a5ee8269b55966cc2b4abd867bab3add
2016-09-30 23:15:25 +00:00
Kevin Hufnagle
cd20b2b8fe docs: Fixed attribute mismatch between XML and Java code samples for a "Clip" drawable. am: aacd1ba6a7 am: 2f37605c6d am: e1efecadf1 am: fae80651ed
am: 52a30b09e1

Change-Id: I34afb9276ee51fd8b9113870be29f71d88eb904d
2016-09-30 23:14:17 +00:00
Joe Fernandez
0d4a1cf509 Merge "docs: Fixed attribute mismatch between XML and Java code samples for a "Clip" drawable." into nyc-dev am: 356348d9e8 am: 5c3e0af0e9
am: 46512fcc6e

Change-Id: Ie17fd57f0b710e53dfcdff3cb952a551c2b10970
2016-09-30 23:13:07 +00:00
Android Build Merger (Role)
f86c89f041 Merge "docs: Fixed attribute mismatch between XML and Java code samples for a "Clip" drawable. am: aacd1ba6a7 am: cad4233268 am: d6d29871e1" 2016-09-30 23:10:00 +00:00
Kevin Hufnagle
b8e778f57a docs: Fixed attribute mismatch between XML and Java code samples for a "Clip" drawable. am: aacd1ba6a7 am: cad4233268
am: d6d29871e1

Change-Id: Id856982dedfc3293251626cf59c160fa672c76fa
2016-09-30 23:09:06 +00:00
Android Build Merger (Role)
aad73b6232 Merge "Merge "Search for runtime resource overlays in Java in subdir." into cw-f-dev am: 58b783701c am: 93e985be7e" 2016-09-30 23:08:47 +00:00
Jakub Adámek
aaac29db56 Merge "Search for runtime resource overlays in Java in subdir." into cw-f-dev am: 58b783701c
am: 93e985be7e

Change-Id: I41679c47a4b22c6cd9328b18cb93ca49915cec9a
2016-09-30 23:07:52 +00:00
Android Build Merger (Role)
3e44495357 Merge "Search for runtime resource overlays in Java in subdir. am: e9ac5b42d2 am: c78e3d45f6" 2016-09-30 23:07:27 +00:00
Jakub Adamek
9fe3b85991 Search for runtime resource overlays in Java in subdir. am: e9ac5b42d2
am: c78e3d45f6

Change-Id: Ie2c8ff3cc6016e96bc1c9c28106669a344d7246b
2016-09-30 23:06:37 +00:00
Android Build Merger (Role)
6741b0fbe2 Merge "Merge "Fix crash if drawable doesn't have constant state" into nyc-mr1-dev am: a04451827e am: 9f79e64be7 am: bb7e2cc801" 2016-09-30 23:06:14 +00:00
Jorim Jaggi
9007439fdf Merge "Fix crash if drawable doesn't have constant state" into nyc-mr1-dev am: a04451827e am: 9f79e64be7
am: bb7e2cc801

Change-Id: I86697f4a354969297785bcf31dd81ea931355efb
2016-09-30 23:05:30 +00:00
Android Build Merger (Role)
a45a132428 Merge "Fix crash if drawable doesn't have constant state am: 92d0602a7c am: 0ea9093df7 am: 38afe3a0c0" 2016-09-30 23:05:13 +00:00
TreeHugger Robot
925c335015 Merge "Update category key values." 2016-09-30 23:04:44 +00:00
Jorim Jaggi
bc5a090d92 Fix crash if drawable doesn't have constant state am: 92d0602a7c am: 0ea9093df7
am: 38afe3a0c0

Change-Id: I698682c8257ea63c41bd55faa579e24609baac74
2016-09-30 23:04:23 +00:00
Jorim Jaggi
129def02a5 Merge "Fix NPE in overridePlayingAppAnimations" into nyc-mr1-dev am: 26df2bf4f8 am: e3e70745c8
am: a5dda3ec72

Change-Id: I062ec2b64e49e34932050e8dda2918b8f4888d08
2016-09-30 23:03:15 +00:00
Jorim Jaggi
8e9c1a592c Fix NPE in overridePlayingAppAnimations am: 6e5f3d2e9f am: 6799190178
am: 14ff7289e2

Change-Id: Ie3cfa89ee1d8779352bc74c21d42b85dd09bc967
2016-09-30 23:02:08 +00:00
Jorim Jaggi
26fc9007ea Merge "Don't start recents if no transition is happening" into nyc-mr1-dev am: 84826a0d4c am: eae871f1ed
am: b49fedda4f

Change-Id: I608970c939cfa1131c3e47a901b405e3547204ee
2016-09-30 23:01:10 +00:00