OSDN Git Service
Jordan Liu [Tue, 4 Oct 2016 18:29:30 +0000 (18:29 +0000)]
Merge "Remove config in frameworks/base" am:
529f8d7209 am:
32e1d7f6b4
am:
1c4c9c7690
Change-Id: I0c1436660146bcebc573671b4fbc0f95df25b4ab
Jordan Liu [Tue, 4 Oct 2016 18:22:27 +0000 (18:22 +0000)]
Merge "Remove config in frameworks/base" am:
529f8d7209
am:
32e1d7f6b4
Change-Id: I3016d18369640dfc7336106b2272f737113b133a
Jordan Liu [Tue, 4 Oct 2016 18:16:30 +0000 (18:16 +0000)]
Merge "Remove config in frameworks/base"
am:
529f8d7209
Change-Id: I20e8eef28b656fd60da84da00b9d9d566d3b340b
Jordan Liu [Tue, 4 Oct 2016 18:07:01 +0000 (18:07 +0000)]
Merge "Remove config in frameworks/base"
Jakub Adamek [Tue, 4 Oct 2016 10:14:30 +0000 (10:14 +0000)]
Adding customizable background colour support.
am:
eedebc4850
Change-Id: I0accdfc75b295bed8e8779d85bb8c48f47595cee
Wale Ogunwale [Mon, 3 Oct 2016 23:29:46 +0000 (23:29 +0000)]
Merge "Fix window animation flash issue" am:
1a02a26838 am:
bb5f6db56a
am:
63993f20a4
Change-Id: I4b9d03bd48c6fb4a676c8ef3746fd757eb1f3943
Wale Ogunwale [Mon, 3 Oct 2016 23:24:56 +0000 (23:24 +0000)]
Merge "Fix window animation flash issue" am:
1a02a26838
am:
bb5f6db56a
Change-Id: Iea47c85999a4584ba878761710a175d925d0809a
Wale Ogunwale [Mon, 3 Oct 2016 23:20:52 +0000 (23:20 +0000)]
Merge "Fix window animation flash issue"
am:
1a02a26838
Change-Id: Ib68ce77146e653b95cec215e4a80aaa0fb106ad2
Wale Ogunwale [Mon, 3 Oct 2016 23:14:34 +0000 (23:14 +0000)]
Merge "Fix window animation flash issue"
Bert McMeen [Mon, 3 Oct 2016 21:22:07 +0000 (21:22 +0000)]
Docs: Wear preview 3 - tweaks to gradle snippet am:
70c6411a10
am:
e617192fff
Change-Id: I08f517647976426a357a18e8f8ff44c52f1730ac
Bert McMeen [Mon, 3 Oct 2016 21:15:44 +0000 (21:15 +0000)]
Docs: Wear preview 3 - tweaks to gradle snippet
am:
70c6411a10
Change-Id: Ia167f04b40f1edf2cf4b95d2e1b56b3efa6b8a75
Bert McMeen [Mon, 3 Oct 2016 20:32:54 +0000 (13:32 -0700)]
Docs: Wear preview 3 - tweaks to gradle snippet
Bug:
31910705
Change-Id: Ia58ac7bec8e748a797c6213bbd31a05f876e2424
Colin Cross [Mon, 3 Oct 2016 20:32:01 +0000 (20:32 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions" am:
8f1011d584 am:
6d0b466935
am:
95311818f0
Change-Id: I45b57d37d08699afc070699d07485cb83c51850a
Colin Cross [Mon, 3 Oct 2016 20:27:46 +0000 (20:27 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions" am:
8f1011d584
am:
6d0b466935
Change-Id: I9602684e0ac91f7c08dafe70309433bb233ceeaf
Adam Lesinski [Mon, 3 Oct 2016 20:26:41 +0000 (20:26 +0000)]
Merge "[AssetManager]:Fix thread race caused double free issue." am:
126e022095 am:
f48d0b8f19
am:
73b91c63ad
Change-Id: I27f5cc6106f0a8f0a58721e1e8ed836144347b6a
Colin Cross [Mon, 3 Oct 2016 20:23:40 +0000 (20:23 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"
am:
8f1011d584
Change-Id: I259197408884f11e61f61e5241ee0012de28b54f
Adam Lesinski [Mon, 3 Oct 2016 20:21:46 +0000 (20:21 +0000)]
Merge "[AssetManager]:Fix thread race caused double free issue." am:
126e022095
am:
f48d0b8f19
Change-Id: Ia7da9ff37d813729a8c916a3b6e378110045aa17
Adam Lesinski [Mon, 3 Oct 2016 20:18:52 +0000 (20:18 +0000)]
Merge "[AssetManager]:Fix thread race caused double free issue."
am:
126e022095
Change-Id: I9928064b4811579bd50d4eeaff98bd4200b8bc7b
Colin Cross [Mon, 3 Oct 2016 20:16:16 +0000 (20:16 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"
Adam Lesinski [Mon, 3 Oct 2016 20:07:37 +0000 (20:07 +0000)]
Merge "[AssetManager]:Fix thread race caused double free issue."
Jakub Adamek [Fri, 23 Sep 2016 08:04:23 +0000 (09:04 +0100)]
Adding customizable background colour support.
Also changes how sub-styles are created: copies the modified properties
like e.g. fullscreen from Material. Previously most sub-styles
inherited from their material counterparts and updated just some colors.
The new approach should be more stable wrt changes in device default
theme. It would need updating when Material is updated but these kind
of properties does not look like it would be updated often.
Bug:
31459804
Change-Id: I78862bf33ca3dac586ad0a25f17bf8c0008a1dd0
Adarsh Fernando [Mon, 3 Oct 2016 16:02:19 +0000 (16:02 +0000)]
Docs: Redirect for Android Studio IR Flight Recorder am:
1face37061
am:
164c750f8d
Change-Id: Ie7589409473d5efcae3d0c6477c8861d14b45472
Adarsh Fernando [Mon, 3 Oct 2016 15:53:57 +0000 (15:53 +0000)]
Docs: Redirect for Android Studio IR Flight Recorder
am:
1face37061
Change-Id: If7cb92c670ef093f88314fd61dcb828abace5c31
Tobias Thierer [Mon, 3 Oct 2016 14:05:33 +0000 (14:05 +0000)]
Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" am:
01614e4e7f am:
abc432fd09
am:
19e46f91fa
Change-Id: I55ae235e9f1aa0e1442549408206fb9dcc0b6d91
Tobias Thierer [Mon, 3 Oct 2016 13:57:22 +0000 (13:57 +0000)]
Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" am:
01614e4e7f
am:
abc432fd09
Change-Id: Iebccf0f8b271649596066807f0a59f5fefb3ee94
Tobias Thierer [Mon, 3 Oct 2016 13:50:39 +0000 (13:50 +0000)]
Merge "API changes for Locale to OpenJDK8u60 (part 1/2)"
am:
01614e4e7f
Change-Id: Iaa1c3b284d4ff97799dd1939da34c088b95b7915
Tobias Thierer [Mon, 3 Oct 2016 13:41:48 +0000 (13:41 +0000)]
Merge "API changes for Locale to OpenJDK8u60 (part 1/2)"
Jakub Adamek [Mon, 3 Oct 2016 10:30:14 +0000 (10:30 +0000)]
Change name of overlay subdir property to sku.
am:
c03d9483f0
Change-Id: I1368890b9c2dde2c5177473da3af0872c0c937a1
Jakub Adamek [Fri, 30 Sep 2016 08:19:09 +0000 (09:19 +0100)]
Change name of overlay subdir property to sku.
Also move the SKU subdirectories directly under /vendor/overlay.
Bug:
31692079
Change-Id: I68c712b13918cc99629534580ee4f77d9e5b3823
Adarsh Fernando [Sat, 1 Oct 2016 19:23:49 +0000 (12:23 -0700)]
Docs: Redirect for Android Studio IR Flight Recorder
Bug:
31631770
Change-Id: Id3c4b8d141242521bef6364af2bbd47b950258c2
Qiushi Han [Sat, 1 Oct 2016 09:06:49 +0000 (17:06 +0800)]
Fix window animation flash issue
The original logic cuts down the mShownPosition, causing 1 pixel offset,
sometimes this will cause flash.
To fix this, Use Math.round() instead.
google issue:
https://code.google.com/p/android/issues/detail?id=224185
Change-Id: I8a2fe55a2df6eaa9eda4ba78966a74ea492ab8ea
Bill Yi [Sat, 1 Oct 2016 09:02:40 +0000 (09:02 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
c350547dcf -s ours
Change-Id: Ie402c8356e404b6354cce97c10fee74ebd181ee5
Bill Yi [Sat, 1 Oct 2016 09:02:26 +0000 (09:02 +0000)]
Import translations. DO NOT MERGE
am:
69fa3bcb6c -s ours
Change-Id: I0d10347107ad3ff1c510d8b7ea8636478835687f
Bill Yi [Sat, 1 Oct 2016 09:00:44 +0000 (09:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
4408ea334a -s ours
Change-Id: I2b9aef327cc6e5452aa7f3d7f2a83c6f7b82a6c2
Bill Yi [Sat, 1 Oct 2016 09:00:37 +0000 (09:00 +0000)]
Import translations. DO NOT MERGE
am:
28f02b2e72 -s ours
Change-Id: I74b0cce880afaa6392cba9a89173fc68155633c8
TreeHugger Robot [Sat, 1 Oct 2016 08:54:45 +0000 (08:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sat, 1 Oct 2016 08:54:11 +0000 (08:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Colin Cross [Sat, 1 Oct 2016 00:36:46 +0000 (17:36 -0700)]
Fix struct vs. class mismatch in forward definitions
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: Ib7227295e7b94c79cdc52e19c71be4066a11cedc
Bill Yi [Sat, 1 Oct 2016 02:00:29 +0000 (19:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6958c00c5473a46a9dcfeb60b6ce5f8159d11f1d
Auto-generated-cl: translation import
Hemal Patel [Sat, 1 Oct 2016 01:54:54 +0000 (01:54 +0000)]
Merge "Docs: Fixed the Service link" into nyc-dev am:
b4be5089f3
am:
f9fd4c01f3
Change-Id: I37d85dd364b780d384388f4673c05a2ecef6be52
Hemal Patel [Sat, 1 Oct 2016 01:53:53 +0000 (01:53 +0000)]
Docs: Fixed the Service link am:
1918214589
am:
e361f735d4
Change-Id: If7fc70c876f999c8a1d6635a3d39bbcc85708dc9
Bill Yi [Sat, 1 Oct 2016 01:52:22 +0000 (18:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia7e6389c2b54eb7e81af07a6d96a815f1cbbc8bd
Auto-generated-cl: translation import
Hemal Patel [Sat, 1 Oct 2016 01:46:05 +0000 (01:46 +0000)]
Merge "Docs: Fixed the Service link" into nyc-dev
am:
b4be5089f3
Change-Id: Ibcb3fa823e5a6191ceed1018e2e921ed1d1d9712
Hemal Patel [Sat, 1 Oct 2016 01:46:01 +0000 (01:46 +0000)]
Docs: Fixed the Service link
am:
1918214589
Change-Id: I52410cb0cccf0c1c99b13504672acdb0eadb9bc5
TreeHugger Robot [Sat, 1 Oct 2016 01:36:11 +0000 (01:36 +0000)]
Merge "Docs: Fixed the Service link" into nyc-dev
Tao Bao [Fri, 30 Sep 2016 23:26:32 +0000 (23:26 +0000)]
Merge "Handle the race condition when calling uncrypt services." into nyc-mr1-dev am:
473b048cf7
am:
9d5021c2e1
Change-Id: I4ad0e3d0ff361b83b1646c5df15a2821ddcac344
Tao Bao [Fri, 30 Sep 2016 23:25:24 +0000 (23:25 +0000)]
Handle the race condition when calling uncrypt services. am:
1eabf53437
am:
9bd481b3cf
Change-Id: Iaeeecf55fd66658f89b0abfd54e0b53869c1801c
John Reck [Fri, 30 Sep 2016 23:24:18 +0000 (23:24 +0000)]
Merge "SurfaceView only call forceDisconnect if isValid" into nyc-mr1-dev am:
00515f8eab
am:
d6846db29e
Change-Id: I4f58726b96b9af926149cc5ea8805d0dfbebaae1
John Reck [Fri, 30 Sep 2016 23:23:17 +0000 (23:23 +0000)]
SurfaceView only call forceDisconnect if isValid am:
6ba466ff3e
am:
5a0da698a7
Change-Id: I356848f7edb11304d9ab4584dab8e5895ff49762
Tao Bao [Fri, 30 Sep 2016 23:16:42 +0000 (23:16 +0000)]
Merge "Handle the race condition when calling uncrypt services." into nyc-mr1-dev
am:
473b048cf7
Change-Id: Ica2b14c6372e12873290d3c3fc244bb0f03c305d
Tao Bao [Fri, 30 Sep 2016 23:16:37 +0000 (23:16 +0000)]
Handle the race condition when calling uncrypt services.
am:
1eabf53437
Change-Id: Ia5ac4f91618c1cf4aee67d069542676cf0a5e787
John Reck [Fri, 30 Sep 2016 23:15:10 +0000 (23:15 +0000)]
Merge "SurfaceView only call forceDisconnect if isValid" into nyc-mr1-dev
am:
00515f8eab
Change-Id: I016ee20efafd4b3261c8d47fc1ee080a592dbefa
John Reck [Fri, 30 Sep 2016 23:15:04 +0000 (23:15 +0000)]
SurfaceView only call forceDisconnect if isValid
am:
6ba466ff3e
Change-Id: I890142436b2442cced212550ac916bedf1306bc9
Tao Bao [Fri, 30 Sep 2016 23:07:34 +0000 (23:07 +0000)]
Merge "Handle the race condition when calling uncrypt services." into nyc-mr1-dev
TreeHugger Robot [Fri, 30 Sep 2016 23:05:46 +0000 (23:05 +0000)]
Merge "SurfaceView only call forceDisconnect if isValid" into nyc-mr1-dev
Hemal Patel [Fri, 30 Sep 2016 23:03:52 +0000 (23:03 +0000)]
Merge "Docs: Fixed the code sample" into nyc-dev am:
91690d0c68 am:
3b097c9980 am:
ab262da7df
am:
896ee296fc
Change-Id: Iaf77a59fe9e7bb602cd29a3f309ab36e8029b729
Hemal Patel [Fri, 30 Sep 2016 23:02:49 +0000 (23:02 +0000)]
Docs: Fixed the code sample am:
a80822a98b am:
313b1d7310 am:
d44d34d329
am:
0af4f5eddd
Change-Id: I84d623bfb1d362c81ede70cc81799817aefb3fdf
Hemal Patel [Fri, 30 Sep 2016 22:56:49 +0000 (22:56 +0000)]
Merge "Docs: Fixed the code sample" into nyc-dev am:
91690d0c68 am:
3b097c9980
am:
ab262da7df
Change-Id: I7f94f4863beb2bd93523459aebd34c2546725408
Hemal Patel [Fri, 30 Sep 2016 22:55:45 +0000 (22:55 +0000)]
Docs: Fixed the code sample am:
a80822a98b am:
313b1d7310
am:
d44d34d329
Change-Id: I3f74ab6f0968dc20e55738996b930c29d9912628
Hemal Patel [Fri, 30 Sep 2016 22:49:47 +0000 (22:49 +0000)]
Merge "Docs: Fixed the code sample" into nyc-dev am:
91690d0c68
am:
0b2316b41e
Change-Id: I0629a3deee8ce0ac58177d289f82d6c736e22667
Hemal Patel [Fri, 30 Sep 2016 22:49:43 +0000 (22:49 +0000)]
Merge "Docs: Fixed the code sample" into nyc-dev am:
91690d0c68
am:
3b097c9980
Change-Id: I0b7923ca2f6bd6b4dffe3e535d89d3a42697b8ee
Hemal Patel [Fri, 30 Sep 2016 22:48:43 +0000 (22:48 +0000)]
Docs: Fixed the code sample am:
a80822a98b
am:
f87a5a47d6
Change-Id: I634bb6bd8e89f1ed25f99c3cc498470f5995d744
Hemal Patel [Fri, 30 Sep 2016 22:48:41 +0000 (22:48 +0000)]
Docs: Fixed the code sample am:
a80822a98b
am:
313b1d7310
Change-Id: I225d1eafeacf85a19c86c28b413e550c824a8282
Tyler Gunn [Fri, 30 Sep 2016 22:45:22 +0000 (22:45 +0000)]
Merge "Increase char limit for string." into nyc-mr1-dev am:
971c42180b
am:
c47ad5972d
Change-Id: Iae6f292ae1c4d054d792402bcb4452395f83e317
Tyler Gunn [Fri, 30 Sep 2016 22:44:26 +0000 (22:44 +0000)]
Increase char limit for string. am:
be6919995f
am:
93eedcc9f3
Change-Id: I0130cdd92b8d339290271a58101ab1e436d46933
Hemal Patel [Fri, 30 Sep 2016 22:42:16 +0000 (22:42 +0000)]
Merge "Docs: Fixed the code sample" into nyc-dev
am:
91690d0c68
Change-Id: I255a5716f31a3d49c9f8933a8d4796fec9d36973
Hemal Patel [Fri, 30 Sep 2016 22:42:15 +0000 (22:42 +0000)]
Merge "Docs: Fixed the code sample" into nyc-dev
am:
91690d0c68
Change-Id: I3f6874ac6b77782f49f566641ad9c3cc4df3979c
Hemal Patel [Fri, 30 Sep 2016 22:42:12 +0000 (22:42 +0000)]
Docs: Fixed the code sample
am:
a80822a98b
Change-Id: Ib8146f5e2817e13caf9cc8f91e47423356423d8e
Hemal Patel [Fri, 30 Sep 2016 22:42:11 +0000 (22:42 +0000)]
Docs: Fixed the code sample
am:
a80822a98b
Change-Id: Ibff20909ca0dfdf4ee2686ca3a9f797d9cda3b19
Tyler Gunn [Fri, 30 Sep 2016 22:35:41 +0000 (22:35 +0000)]
Merge "Increase char limit for string." into nyc-mr1-dev
am:
971c42180b
Change-Id: I54a8bddd2b773ab44f8036059acc91a9934bf9ee
Tyler Gunn [Fri, 30 Sep 2016 22:35:38 +0000 (22:35 +0000)]
Increase char limit for string.
am:
be6919995f
Change-Id: Iefde844a66eec33f6c2b85262c80952dd82821fc
Hemal Patel [Fri, 30 Sep 2016 22:27:53 +0000 (22:27 +0000)]
Merge "Docs: Fixed the code sample" into nyc-dev
TreeHugger Robot [Fri, 30 Sep 2016 22:23:18 +0000 (22:23 +0000)]
Merge "Increase char limit for string." into nyc-mr1-dev
Mark Lu [Fri, 30 Sep 2016 22:11:27 +0000 (22:11 +0000)]
Merge "Docs: Updates to backup documentation" into nyc-dev am:
d93a31bbe0 am:
6bd0c689e9 am:
e3be77810d
am:
b76fe80d2b
Change-Id: I2f80746f92bef8af623b1fe116262735fd511de9
Mark Lu [Fri, 30 Sep 2016 22:10:15 +0000 (22:10 +0000)]
Docs: Updates to backup documentation am:
f0968050f6 am:
0109b0f83a am:
49798d8b15
am:
35f63ff629
Change-Id: I8cbcda0317b7b0a56c398de8e906e44c7a8cb047
Mark Lu [Fri, 30 Sep 2016 22:04:04 +0000 (22:04 +0000)]
Merge "Docs: Updates to backup documentation" into nyc-dev am:
d93a31bbe0 am:
6bd0c689e9
am:
e3be77810d
Change-Id: I839af5fe1814a12cc27b35fc9616c9f72da29d31
Mark Lu [Fri, 30 Sep 2016 22:03:07 +0000 (22:03 +0000)]
Docs: Updates to backup documentation am:
f0968050f6 am:
0109b0f83a
am:
49798d8b15
Change-Id: I0049600a7aa9c826d73bb7786ef6d3509100229a
Hemal Patel [Fri, 30 Sep 2016 21:59:23 +0000 (14:59 -0700)]
Docs: Fixed the Service link
Bug:
29086415
Change-Id: Id9505ade39c19eb817f556d72f689568148e1782
Android Build Merger (Role) [Fri, 30 Sep 2016 21:58:05 +0000 (21:58 +0000)]
Merge "Merge "Docs: Updates to backup documentation" into nyc-dev am:
d93a31bbe0 am:
ddc523b5b3" into nyc-mr1-dev-plus-aosp
Mark Lu [Fri, 30 Sep 2016 21:57:20 +0000 (21:57 +0000)]
Merge "Docs: Updates to backup documentation" into nyc-dev am:
d93a31bbe0
am:
ddc523b5b3
Change-Id: Ibd01c9b7b131ac609f66193328c9f502e9c76d0f
Mark Lu [Fri, 30 Sep 2016 21:57:15 +0000 (21:57 +0000)]
Merge "Docs: Updates to backup documentation" into nyc-dev am:
d93a31bbe0
am:
6bd0c689e9
Change-Id: I7b3e73ff2664388e585e59b96d09f184b73c2ba6
Android Build Merger (Role) [Fri, 30 Sep 2016 21:56:50 +0000 (21:56 +0000)]
Merge "Docs: Updates to backup documentation am:
f0968050f6 am:
233f52d92b" into nyc-mr1-dev-plus-aosp
Mark Lu [Fri, 30 Sep 2016 21:56:14 +0000 (21:56 +0000)]
Docs: Updates to backup documentation am:
f0968050f6
am:
233f52d92b
Change-Id: Ic8c9c6d0ad323abd64321805b2407616a35d6030
David Friedman [Fri, 30 Sep 2016 21:56:10 +0000 (21:56 +0000)]
Docs: Minor TOC and link fixes for newly released iteration of Perf docs. am:
a9c3a0b529 am:
b25c08fa32 am:
f7b37fa056
am:
c2553a64e1
Change-Id: I0d72647cf1b119fd5e75330e220f154372383184
Mark Lu [Fri, 30 Sep 2016 21:56:06 +0000 (21:56 +0000)]
Docs: Updates to backup documentation am:
f0968050f6
am:
0109b0f83a
Change-Id: Ib966eb7e733064344d10c2c70ee97e995edb7a5d
Mark Lu [Fri, 30 Sep 2016 21:49:28 +0000 (21:49 +0000)]
Merge "Docs: Updates to backup documentation" into nyc-dev
am:
d93a31bbe0
Change-Id: I852b6a74f0be30a063c30bdb82553ba80f2717fe
Mark Lu [Fri, 30 Sep 2016 21:49:23 +0000 (21:49 +0000)]
Docs: Updates to backup documentation
am:
f0968050f6
Change-Id: I6364318aca4e56dc72a049d20b5cab99190d7ed4
Mark Lu [Fri, 30 Sep 2016 21:49:16 +0000 (21:49 +0000)]
Merge "Docs: Updates to backup documentation" into nyc-dev
am:
d93a31bbe0
Change-Id: I3943558e87f27c3bb0db9cc9ccb08e16d52811f4
Mark Lu [Fri, 30 Sep 2016 21:49:11 +0000 (21:49 +0000)]
Docs: Updates to backup documentation
am:
f0968050f6
Change-Id: Ib4c23d6c78958f0d35ee313b341c8da7513e574a
David Friedman [Fri, 30 Sep 2016 21:49:09 +0000 (21:49 +0000)]
Docs: Minor TOC and link fixes for newly released iteration of Perf docs. am:
a9c3a0b529 am:
b25c08fa32
am:
f7b37fa056
Change-Id: If60db9344db3bb16860685904e82845bdb768b60
David Friedman [Fri, 30 Sep 2016 21:45:39 +0000 (21:45 +0000)]
Docs: Minor TOC and link fixes for newly released iteration of Perf docs. am:
a9c3a0b529
am:
bcbed91c2f
Change-Id: I3c9999e0e1aacaef58e227f9d004d8ebe3508fba
David Friedman [Fri, 30 Sep 2016 21:45:35 +0000 (21:45 +0000)]
Docs: Minor TOC and link fixes for newly released iteration of Perf docs. am:
a9c3a0b529
am:
b25c08fa32
Change-Id: I4c8f976ab1f679179f2b3221d8889088309bfdc0
Mark Lu [Fri, 30 Sep 2016 21:40:28 +0000 (21:40 +0000)]
Merge "Docs: Updates to backup documentation" into nyc-dev
David Friedman [Fri, 30 Sep 2016 21:39:38 +0000 (21:39 +0000)]
Docs: Minor TOC and link fixes for newly released iteration of Perf docs.
am:
a9c3a0b529
Change-Id: I8f874cbd848923e7f50ccd04e298bdc4e97f0b83
David Friedman [Fri, 30 Sep 2016 21:39:35 +0000 (21:39 +0000)]
Docs: Minor TOC and link fixes for newly released iteration of Perf docs.
am:
a9c3a0b529
Change-Id: I60cd53d9a3a70c7f16a52bb7358b90f01833c118
John Reck [Fri, 30 Sep 2016 21:30:04 +0000 (14:30 -0700)]
SurfaceView only call forceDisconnect if isValid
Change-Id: I683c2f937f44d8b3d912839a3e91cbd5b5c7f437
Fixes:
31778946
Test: Manual, launch Cookie Jam then tap recents
David Friedman [Fri, 30 Sep 2016 21:25:45 +0000 (14:25 -0700)]
Docs: Minor TOC and link fixes for newly released iteration of Perf docs.
Change-Id: I61a9477ae129138932d4da29253bc2e6ece8357d
Etan Cohen [Fri, 30 Sep 2016 21:15:36 +0000 (21:15 +0000)]
Merge changes from topic 'cherry-pick' am:
e3d5fa1094 am:
12b4883032
am:
e8e0ee0789
Change-Id: I94b162cbd783573c629fcd50a3eb11db0d003441
Etan Cohen [Fri, 30 Sep 2016 21:14:30 +0000 (21:14 +0000)]
[NAN] Register WIFI_NAN_STATE_CHANGED as protected broadcast am:
720d175757 am:
083f313756
am:
a06821b2cf
Change-Id: I23d1aee5e8cf1134ea03e7a3b4f32fe931855f14
Etan Cohen [Fri, 30 Sep 2016 21:13:09 +0000 (21:13 +0000)]
[NAN] Update API javadoc to clarify NAN status change broadcast scope am:
4c22e8bede am:
c3066c1d68
am:
4cb72b6125
Change-Id: I9decc48fd6486e5ef82c359c95d3b472ee5543d0
OSDN Git Service
