OSDN Git Service
Michael Kwan [Tue, 6 Dec 2016 02:17:44 +0000 (02:17 +0000)]
Revert "Change activity dismiss animation to move left to right." am:
ac9443ef9c
am:
e309596c62
Change-Id: I33a123cadaf6e63be680f068b7398934e150c93e
Android Build Merger (Role) [Tue, 6 Dec 2016 02:14:08 +0000 (02:14 +0000)]
Merge "Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am:
050cf854c7 am:
5a701867d5 am:
38e1cc9790" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Tue, 6 Dec 2016 02:13:23 +0000 (02:13 +0000)]
Merge "Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am:
050cf854c7 am:
5a701867d5 am:
d41497de6c" into nyc-mr2-dev-plus-aosp
Elliot Waite [Tue, 6 Dec 2016 02:13:23 +0000 (02:13 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am:
050cf854c7 am:
5a701867d5
am:
38e1cc9790
Change-Id: I878653770a5247cf50e09c16a76f82727a484af2
Android Build Merger (Role) [Tue, 6 Dec 2016 02:12:56 +0000 (02:12 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link. am:
fc175c08cb am:
c67ea5e3ff am:
634f858088" into nyc-mr2-dev-plus-aosp
Elliot Waite [Tue, 6 Dec 2016 02:12:37 +0000 (02:12 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am:
050cf854c7 am:
5a701867d5
am:
d41497de6c
Change-Id: Ibd20375c157cb02bcfa8a2785f3042f1fa3f5d1b
Elliot Waite [Tue, 6 Dec 2016 02:12:07 +0000 (02:12 +0000)]
Change insecure HTTP resource link to scheme-relative link. am:
fc175c08cb am:
c67ea5e3ff
am:
634f858088
Change-Id: I61ffb363e67be17675462ea67cb6636a57aeb470
Michael Kwan [Tue, 6 Dec 2016 02:11:38 +0000 (02:11 +0000)]
Revert "Change activity dismiss animation to move left to right."
am:
ac9443ef9c
Change-Id: I92a48596e4ef5d24591cc063525ad719c24207a8
Elliot Waite [Tue, 6 Dec 2016 02:11:36 +0000 (02:11 +0000)]
Change insecure HTTP resource link to scheme-relative link. am:
fc175c08cb am:
c67ea5e3ff
am:
4835467efa
Change-Id: I9ad9bba2fb2498b39a6ef75de0362c67d11b2c03
Elliot Waite [Tue, 6 Dec 2016 02:06:25 +0000 (02:06 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am:
050cf854c7
am:
5a701867d5
Change-Id: I2fad5b6fcd04c881ffacf8911d6c179d3af6f72a
Elliot Waite [Tue, 6 Dec 2016 02:06:13 +0000 (02:06 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am:
050cf854c7
am:
5a701867d5
Change-Id: I7f5b828bd0d68f58c96765be05eb851f45d7677d
Elliot Waite [Tue, 6 Dec 2016 02:05:14 +0000 (02:05 +0000)]
Change insecure HTTP resource link to scheme-relative link. am:
fc175c08cb
am:
c67ea5e3ff
Change-Id: If9c3962ac88678359e687623fc56cfcd803910bc
Elliot Waite [Tue, 6 Dec 2016 02:05:08 +0000 (02:05 +0000)]
Change insecure HTTP resource link to scheme-relative link. am:
fc175c08cb
am:
c67ea5e3ff
Change-Id: Ia69b611a90b4c72e1cc9aa846ed12e0af685a0f4
Elliot Waite [Tue, 6 Dec 2016 01:59:16 +0000 (01:59 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev
am:
050cf854c7
Change-Id: Ibf58c209a59a7e9dc64976bafb5f4f9bfaa9a840
Elliot Waite [Tue, 6 Dec 2016 01:59:12 +0000 (01:59 +0000)]
Change insecure HTTP resource link to scheme-relative link.
am:
fc175c08cb
Change-Id: Ib5501d311ed6ee620d81b8399334097ea4c432a2
Elliot Waite [Tue, 6 Dec 2016 01:52:08 +0000 (01:52 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev
Alan Viverette [Tue, 6 Dec 2016 01:07:49 +0000 (01:07 +0000)]
Merge "Show popup transitions when there is no anchor set" into nyc-mr2-dev
am:
6ad979a637
Change-Id: Id630eba9ce140eea6b6f95c4b722d8da4ca09cfe
Alan Viverette [Tue, 6 Dec 2016 01:07:43 +0000 (01:07 +0000)]
Show popup transitions when there is no anchor set
am:
61edf5bbff
Change-Id: If658b86996fbaff411d7c487f913368715026935
Alan Viverette [Tue, 6 Dec 2016 01:02:03 +0000 (01:02 +0000)]
Merge "Show popup transitions when there is no anchor set" into nyc-mr2-dev
Jeff Sharkey [Tue, 6 Dec 2016 00:35:44 +0000 (00:35 +0000)]
Merge "Initial Binder interface for installd." am:
19fc36fa33 am:
2ab7bff525
am:
48eb4e390e
Change-Id: I0f8015d3ca80d1f6a806b2ff7b739ea27feddc10
Jeff Sharkey [Tue, 6 Dec 2016 00:29:38 +0000 (00:29 +0000)]
Merge "Initial Binder interface for installd." am:
19fc36fa33
am:
2ab7bff525
Change-Id: I80f56bc8e531fd23ffc95f2f75c84add3f9a34e5
Jeff Sharkey [Tue, 6 Dec 2016 00:23:56 +0000 (00:23 +0000)]
Merge "Initial Binder interface for installd."
am:
19fc36fa33
Change-Id: I22e910b705327eafa5c158ec43d6d86eb0b429d0
Jeff Sharkey [Tue, 6 Dec 2016 00:14:53 +0000 (00:14 +0000)]
Merge "Initial Binder interface for installd."
Adrian Roos [Mon, 5 Dec 2016 23:43:13 +0000 (23:43 +0000)]
Merge "Lockscreen: Restrict double taps to prevent falsing" into nyc-mr2-dev
am:
dcb6efcd55
Change-Id: I5e4b04c054522f7620a0a8e1b37830cf2e3711da
Adrian Roos [Mon, 5 Dec 2016 23:43:05 +0000 (23:43 +0000)]
Lockscreen: Restrict double taps to prevent falsing
am:
ac75cddcf5
Change-Id: I25fe91c23f79d8f54cfa106966dbf4a820dd4c6b
Adrian Roos [Mon, 5 Dec 2016 23:37:46 +0000 (23:37 +0000)]
Merge "Lockscreen: Restrict double taps to prevent falsing" into nyc-mr2-dev
Shunta Sato [Mon, 5 Dec 2016 22:48:06 +0000 (22:48 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter" into nyc-mr2-dev
am:
53db761efb
Change-Id: I33a8ef76a1a9c192889f7f66b32b383986789e04
Shunta Sato [Mon, 5 Dec 2016 22:48:00 +0000 (22:48 +0000)]
Avoid NPE around mReusedTask of ActivityStarter
am:
9fff53f2cb
Change-Id: I3e56af93c3feaf34ac93965127ad7817d609dc11
Christine Franks [Mon, 5 Dec 2016 22:42:51 +0000 (22:42 +0000)]
Merge "TwilightService: Ignore (0,0) coordinate location updates" into nyc-mr2-dev
am:
b10e339774
Change-Id: Iae529fc5e891ec115379003cbb4d0236448f2f63
Christine Franks [Mon, 5 Dec 2016 22:42:45 +0000 (22:42 +0000)]
TwilightService: Ignore (0,0) coordinate location updates
am:
cc2801296d
Change-Id: Ic74955ff78956953288de96d261dc1eab8fc6137
TreeHugger Robot [Mon, 5 Dec 2016 22:41:19 +0000 (22:41 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter" into nyc-mr2-dev
Christine Franks [Mon, 5 Dec 2016 22:38:10 +0000 (22:38 +0000)]
Merge "TwilightService: Ignore (0,0) coordinate location updates" into nyc-mr2-dev
Xiaohui Chen [Mon, 5 Dec 2016 21:35:15 +0000 (21:35 +0000)]
Merge "sysui: fix navbar button view orientation" into nyc-mr2-dev
am:
4eaf8c2d9b
Change-Id: I442ff67a71fef2f9fe65c8c7f966259b6c85b495
Xiaohui Chen [Mon, 5 Dec 2016 21:31:45 +0000 (21:31 +0000)]
sysui: fix navbar button view orientation
am:
7917006430
Change-Id: I94127b0eba0f0abf47558131218dd21b5a82e089
TreeHugger Robot [Mon, 5 Dec 2016 21:21:58 +0000 (21:21 +0000)]
Merge "sysui: fix navbar button view orientation" into nyc-mr2-dev
Shunta Sato [Wed, 12 Oct 2016 09:35:17 +0000 (18:35 +0900)]
Avoid NPE around mReusedTask of ActivityStarter
Symptom:
System crash by NPE is observed on ActivityStarter
during phone boot-up.
Detail and sample:
ActivityStarter has possibility to be called itself recursively
by calling TaskRecord$performClearTaskLocked().
Then class variable of mReusedTask is initialized to null
after the call, because the recursive call isn't guarded by
synchronized block.
Then NPE crash occurs on next statement.
Solutions:
Call performClearTaskLocked() before assigning
intentActivity.task to mReusedTask.
Bug:
32361138
Test: builds, boots, Manual testing of condition in bug
Author: Shigeki Yokomichi <shigeki.x.yokomichi@sonymobile.com>
Change-Id: Iaea3e066a6f7134fcae4338ff864bb236241194c
(cherry picked from commit
0bd28e2c5f7fd7e4448ae489b425e4e5cee57f9a)
Jeff Sharkey [Mon, 5 Dec 2016 20:51:57 +0000 (20:51 +0000)]
Merge "Move dump() to dumpAsync(), more oneway calls." into nyc-mr1-dev-plus-aosp
am:
5e2155058d
Change-Id: Ia18426e76a62315071cca3a5deb6cd44578f5314
Jeff Sharkey [Mon, 5 Dec 2016 20:51:52 +0000 (20:51 +0000)]
Move dump() to dumpAsync(), more oneway calls.
am:
c06f184ae9
Change-Id: I1f060cb7e20c732e7c6da412e2e9fb7335011ec8
TreeHugger Robot [Mon, 5 Dec 2016 20:44:56 +0000 (20:44 +0000)]
Merge "Move dump() to dumpAsync(), more oneway calls." into nyc-mr1-dev-plus-aosp
Xiaohui Chen [Mon, 5 Dec 2016 19:26:01 +0000 (19:26 +0000)]
Merge "Fix vertical nav button direction issue" into nyc-mr2-dev
am:
33db4b77d5
Change-Id: I8222d96f03dbde0d325f5e547974161058a8f831
Xiaohui Chen [Mon, 5 Dec 2016 19:25:54 +0000 (19:25 +0000)]
Fix vertical nav button direction issue
am:
854bc8ea1e
Change-Id: Ic1a9a82c4c2c89a2c89430495b6f751b9e6ba717
Xiaohui Chen [Mon, 5 Dec 2016 19:20:16 +0000 (19:20 +0000)]
Merge "Fix vertical nav button direction issue" into nyc-mr2-dev
Christine Franks [Wed, 30 Nov 2016 17:33:07 +0000 (09:33 -0800)]
TwilightService: Ignore (0,0) coordinate location updates
Location providers may erroneously return (0.0, 0.0) when they
fail to determine the device's location. These location updates
can be safely ignored since the chance of a user actually being
at these coordinates is quite low.
Bug:
31009261
Test: added TwilightServiceTest; both tests pass
Change-Id: Ie9d7d10f81ade9b0be10f98ed74978539efaa658
Jeff Sharkey [Mon, 5 Dec 2016 18:19:28 +0000 (11:19 -0700)]
Initial Binder interface for installd.
Start using new installd Binder interface, with a quick-disable
switch if something breaks.
Test: builds, boots
Bug:
13758960,
30944031
Change-Id: Ia6e55d49595c96ae928aefc8a6606ee690e58764
Bill Yi [Mon, 5 Dec 2016 18:43:14 +0000 (18:43 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into nyc-mr2-dev
am:
a1b10fcdb9 -s ours
Change-Id: Ib21612d463f8918a3afea37932a517b555c6690c
Bill Yi [Mon, 5 Dec 2016 18:43:09 +0000 (18:43 +0000)]
Revert "Import translations. DO NOT MERGE"
am:
05ab7a37a4 -s ours
Change-Id: I7ce400c10d832990993bdebda4317bff2ffe800e
Bill Yi [Mon, 5 Dec 2016 18:35:35 +0000 (18:35 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into nyc-mr2-dev
Bill Yi [Mon, 5 Dec 2016 18:35:00 +0000 (18:35 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
52ae3289fba02b03b7cb74afad628b9c80253045.
Change-Id: I629775ecf2470e8a16eb58df5cb1e8406865a6ba
Kouji Shiotani [Mon, 5 Dec 2016 18:31:20 +0000 (18:31 +0000)]
Merge "To enable scroll function at DatePickerDialog" into nyc-mr2-dev
am:
8c917322a7
Change-Id: I4d5a3afeb1b04f3ea955ed92bad3430d117d27ac
Kouji Shiotani [Mon, 5 Dec 2016 18:31:14 +0000 (18:31 +0000)]
To enable scroll function at DatePickerDialog
am:
6b04f11100
Change-Id: I75d4c9ee283d4b76366ab042a50739d788de1764
TreeHugger Robot [Mon, 5 Dec 2016 18:23:53 +0000 (18:23 +0000)]
Merge "To enable scroll function at DatePickerDialog" into nyc-mr2-dev
Android Build Merger (Role) [Mon, 5 Dec 2016 18:16:31 +0000 (18:16 +0000)]
Merge "Disable swipe-to-dismiss for not cancelable dialogs. am:
f7964be938 am:
9120012566" into nyc-mr2-dev-plus-aosp
Michael Kwan [Mon, 5 Dec 2016 18:15:44 +0000 (18:15 +0000)]
Disable swipe-to-dismiss for not cancelable dialogs. am:
f7964be938
am:
9120012566
Change-Id: Ic56ecf1100d40a5e37bc0cbd4376403948efc0c5
Michael Kwan [Mon, 5 Dec 2016 18:14:46 +0000 (18:14 +0000)]
Disable swipe-to-dismiss for not cancelable dialogs. am:
f7964be938
am:
85ba660b16
Change-Id: Ia85402c3008cfd0a6b876fbda4a7a753c23d8a88
Michael Kwan [Mon, 5 Dec 2016 18:09:10 +0000 (18:09 +0000)]
Disable swipe-to-dismiss for not cancelable dialogs.
am:
f7964be938
Change-Id: I6d71bb4c6acdc9d994766eebd7a6320356aa3a23
Michael Kwan [Mon, 5 Dec 2016 18:09:07 +0000 (18:09 +0000)]
Disable swipe-to-dismiss for not cancelable dialogs.
am:
f7964be938
Change-Id: I4a6cad65f91368393272cd8f7d6012d131ec56ff
Etan Cohen [Mon, 5 Dec 2016 16:08:11 +0000 (16:08 +0000)]
Merge "[AWARE] Fix javadocs for match filter update" am:
7241d28826 am:
65617f21bf
am:
4c43aba36e
Change-Id: I0a094416e0eaa1b09ec964cba3ec889ccca35eb6
Etan Cohen [Mon, 5 Dec 2016 16:03:44 +0000 (16:03 +0000)]
Merge "[AWARE] Fix javadocs for match filter update" am:
7241d28826
am:
65617f21bf
Change-Id: I8428c743bf607a096674aa84cb8eda1929b55d84
Etan Cohen [Mon, 5 Dec 2016 15:57:37 +0000 (15:57 +0000)]
Merge "[AWARE] Fix javadocs for match filter update"
am:
7241d28826
Change-Id: I67b2798b0eb1bc7e4ccd727aad9e761da49a8823
ltrochtova [Mon, 5 Dec 2016 15:57:33 +0000 (15:57 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth." am:
5fb37a7641 -s ours am:
8058dc0e82 -s ours
am:
ad5eb744aa -s ours
Change-Id: I2468b18021198c8b1a7dfa739d28ec1aaafba9b1
Alan Viverette [Mon, 5 Dec 2016 15:56:18 +0000 (10:56 -0500)]
Show popup transitions when there is no anchor set
Allow anchorRoot to be null when starting exit transition. Pushes
epicenter callback creation into startExitTransition. Adds nullability
annotations.
Bug:
33035511
Test: PopupWindowTest#testEnterExitTransition
Change-Id: Ie752a0d6b29d5eb11c160771d8a78fa6234de5bb
Etan Cohen [Mon, 5 Dec 2016 15:51:17 +0000 (15:51 +0000)]
Merge "[AWARE] Fix javadocs for match filter update"
ltrochtova [Mon, 5 Dec 2016 15:51:10 +0000 (15:51 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth." am:
5fb37a7641 -s ours
am:
8058dc0e82 -s ours
Change-Id: I1d84e927e8cd05c51285fba9226b1bd9f2c1c12a
ltrochtova [Mon, 5 Dec 2016 15:44:06 +0000 (15:44 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth."
am:
5fb37a7641 -s ours
Change-Id: Ib4a1173b40701562fc41738319371e126eba6c04
Lenka Trochtova [Mon, 5 Dec 2016 15:44:01 +0000 (15:44 +0000)]
Introduce a new user restriction for disallowing Bluetooth. am:
13a0519394
am:
3e149d59f9
Change-Id: I2622c1f9a92ff7784787885859c4b5a7cf974964
Lenka Trochtova [Mon, 5 Dec 2016 15:37:34 +0000 (15:37 +0000)]
Introduce a new user restriction for disallowing Bluetooth.
am:
13a0519394
Change-Id: I3d875e1a7baf69022d58902689fa9370bcb44dc6
ltrochtova [Mon, 5 Dec 2016 15:35:21 +0000 (15:35 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth."
Lenka Trochtova [Fri, 2 Dec 2016 11:19:39 +0000 (12:19 +0100)]
Introduce a new user restriction for disallowing Bluetooth.
Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on the
entire device - i.e. in all the users.
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction
Bug:
32895300
Merged-In: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
Change-Id: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
Lenka Trochtova [Fri, 2 Dec 2016 11:19:39 +0000 (12:19 +0100)]
Introduce a new user restriction for disallowing Bluetooth.
Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on the
entire device - i.e. in all the users.
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction
Bug:
32895300
Merged-In: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
Change-Id: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
Tobias Thierer [Mon, 5 Dec 2016 09:46:21 +0000 (09:46 +0000)]
Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64" am:
1e498a96c1 am:
6e2d3fa82f
am:
386ba42ec5
Change-Id: I0b0e8139cc084fbdf9918dd700d9be337e0c47df
Tobias Thierer [Mon, 5 Dec 2016 09:39:55 +0000 (09:39 +0000)]
Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64" am:
1e498a96c1
am:
6e2d3fa82f
Change-Id: I925b0ca87bbd0f3be3f03865f70cafaaa1ef25ba
Tobias Thierer [Mon, 5 Dec 2016 09:35:10 +0000 (09:35 +0000)]
Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64"
am:
1e498a96c1
Change-Id: I28b8deadc9386b8772bd94870809213fdddad7e6
Tobias Thierer [Mon, 5 Dec 2016 09:28:46 +0000 (09:28 +0000)]
Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64"
Sungsoo Lim [Mon, 5 Dec 2016 04:54:35 +0000 (04:54 +0000)]
Merge "ExifInterface: fix NegativeArraySizeException" am:
c57b472d67 am:
582e612fdc
am:
52dd278eb3
Change-Id: I511eb25ec5124d989889fcf9da33a167eed63bcd
Sungsoo Lim [Mon, 5 Dec 2016 04:47:33 +0000 (04:47 +0000)]
Merge "ExifInterface: fix NegativeArraySizeException" am:
c57b472d67
am:
582e612fdc
Change-Id: I671ef98f05431e7c4baa2a7b84f6cb04a82c5d9d
Sungsoo Lim [Mon, 5 Dec 2016 04:41:30 +0000 (04:41 +0000)]
Merge "ExifInterface: fix NegativeArraySizeException"
am:
c57b472d67
Change-Id: Ifbe9af9b62837923e6e56159759da6c59795b3aa
Sungsoo Lim [Mon, 5 Dec 2016 04:35:17 +0000 (04:35 +0000)]
Merge "ExifInterface: fix NegativeArraySizeException"
Yifan Hong [Sat, 3 Dec 2016 23:22:40 +0000 (23:22 +0000)]
Merge "Use IBase instead of IBinder for IServiceManager." am:
8ead2f0c9a am:
dab9e7bfc7
am:
bc9c711513
Change-Id: I6047e1d936ef515d531a8ad4b875ab443ff2f50d
Yifan Hong [Sat, 3 Dec 2016 23:15:52 +0000 (23:15 +0000)]
Merge "Use IBase instead of IBinder for IServiceManager." am:
8ead2f0c9a
am:
dab9e7bfc7
Change-Id: I8c39d01e0670d200c18ba02dbd3d09cea5a503c7
Yifan Hong [Sat, 3 Dec 2016 23:10:08 +0000 (23:10 +0000)]
Merge "Use IBase instead of IBinder for IServiceManager."
am:
8ead2f0c9a
Change-Id: Ia18426c336f1ba9c9bceb57db0222ba6c59667a9
Treehugger Robot [Sat, 3 Dec 2016 23:04:24 +0000 (23:04 +0000)]
Merge "Use IBase instead of IBinder for IServiceManager."
Michael Kwan [Sat, 3 Dec 2016 19:33:27 +0000 (11:33 -0800)]
Revert "Change activity dismiss animation to move left to right."
This reverts commit
6d969ea4d86918ce8e2e3fb6618527c55f0c05da.
Change-Id: I39ab1bc00d20b6a719ac0930e5596e14fd8345b7
Bill Yi [Sat, 3 Dec 2016 09:59:20 +0000 (09:59 +0000)]
Import translations. DO NOT MERGE
am:
52ae3289fb -s ours
Change-Id: I77c441b5116ab1dc8d9236cdb38bf776afaa88e4
Bill Yi [Sat, 3 Dec 2016 08:20:58 +0000 (00:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifb7cde4b8e869f98f49a2fb0270bc9cd30ed7b0d
Auto-generated-cl: translation import
Sergey Yakovlev [Sat, 3 Dec 2016 04:38:07 +0000 (04:38 +0000)]
Merge "Update Samsung Print Recommendation Plugin (to support Mopria printers)" am:
41f14f47a5 am:
3a1cf2281b
am:
55b91fec65
Change-Id: I2f33f5aa6ade5d155362862849a11374c7f6397f
Roshan Pius [Sat, 3 Dec 2016 04:36:16 +0000 (04:36 +0000)]
Merge changes from topic 'fast-bss-transition' am:
f301986727 am:
33aa9ce35d
am:
e3c4a3bc3f
Change-Id: I107af26f764b751a2d8ca849a8a3d7360aa2493d
Paul Stewart [Sat, 3 Dec 2016 04:35:15 +0000 (04:35 +0000)]
Add capability flag for 802.11r fast BSS transition am:
07f4d23a88 am:
4120c55379
am:
07dec31c44
Change-Id: Ib7ae943c4fe08ec9f4752d33b99b2c2e2c66536c
Paul Stewart [Sat, 3 Dec 2016 04:34:05 +0000 (04:34 +0000)]
Add constants for 802.11r am:
e72f7dc385 am:
1fd6f643ac
am:
cbd9c544a0
Change-Id: I75a206778c116b47820593f2611a09c4238e4345
Sergey Yakovlev [Sat, 3 Dec 2016 04:30:42 +0000 (04:30 +0000)]
Merge "Update Samsung Print Recommendation Plugin (to support Mopria printers)" am:
41f14f47a5
am:
3a1cf2281b
Change-Id: Id94c02dc6106b5eb15274926ecd24e43c0ffc76f
Stephen Chen [Sat, 3 Dec 2016 04:28:56 +0000 (04:28 +0000)]
Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag." am:
d758ce1586 am:
d738140b8d
am:
a4d7d45df9
Change-Id: I5e2ad4633c19c7518bd3eee85aaf60c324d78154
Roshan Pius [Sat, 3 Dec 2016 04:28:44 +0000 (04:28 +0000)]
Merge changes from topic 'fast-bss-transition' am:
f301986727
am:
33aa9ce35d
Change-Id: I6297bf2393113fbe5a82d37b533f808e569b1c73
Colin Cross [Sat, 3 Dec 2016 04:28:05 +0000 (04:28 +0000)]
Merge "Convert libandroidfw to Android.bp" am:
46ec8dba83 am:
9625912b7f
am:
434e16c7bc
Change-Id: Idd0aacb1fe207bebce0c12e1417e0e2ff2978226
Paul Stewart [Sat, 3 Dec 2016 04:27:37 +0000 (04:27 +0000)]
Add capability flag for 802.11r fast BSS transition am:
07f4d23a88
am:
4120c55379
Change-Id: Ic024a7c89528ddce70d700ca5954fa934c2d3cd9
Paul Stewart [Sat, 3 Dec 2016 04:26:34 +0000 (04:26 +0000)]
Add constants for 802.11r am:
e72f7dc385
am:
1fd6f643ac
Change-Id: I320327bfd79bccb206d0c462705364216b9465e0
Stephen Chen [Sat, 3 Dec 2016 04:23:49 +0000 (04:23 +0000)]
Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag." am:
d758ce1586
am:
d738140b8d
Change-Id: Icb8eb81b2021ee12eccd9158974353120228e7c0
Colin Cross [Sat, 3 Dec 2016 04:22:44 +0000 (04:22 +0000)]
Merge "Convert libandroidfw to Android.bp" am:
46ec8dba83
am:
9625912b7f
Change-Id: I1f52bfd7e0dc8b5a543b41f8c4a3b7b2a35355c9
Sergey Yakovlev [Sat, 3 Dec 2016 04:19:44 +0000 (04:19 +0000)]
Merge "Update Samsung Print Recommendation Plugin (to support Mopria printers)"
am:
41f14f47a5
Change-Id: I476bab68c662809bd998f0334441fdd31f6c940a
Roshan Pius [Sat, 3 Dec 2016 04:18:00 +0000 (04:18 +0000)]
Merge changes from topic 'fast-bss-transition'
am:
f301986727
Change-Id: I0b0334f193120d379031d9790d68bc2840254391
Paul Stewart [Sat, 3 Dec 2016 04:17:49 +0000 (04:17 +0000)]
Add capability flag for 802.11r fast BSS transition
am:
07f4d23a88
Change-Id: Ife9a8e1342b6b090dec749cf505fd3091ff33f89
Paul Stewart [Sat, 3 Dec 2016 04:16:58 +0000 (04:16 +0000)]
Add constants for 802.11r
am:
e72f7dc385
Change-Id: I06d93c3ce96cddd6447b340304ce9fec2d4e41f2