OSDN Git Service
Bill Yi [Fri, 19 Aug 2016 14:09:51 +0000 (07:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1eecd96e402c310f88872f87db259ebf181c3014
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 19 Aug 2016 02:30:46 +0000 (02:30 +0000)]
Merge "Set Root.FLAG_LOCAL_ONLY for MTP roots."
Scott Main [Fri, 19 Aug 2016 01:25:29 +0000 (01:25 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev am:
66ffbbfdf9 am:
6e10a6c034
am:
9261e016b7
Change-Id: Ied4d3e3d6aede6cbc215aed2634819906dc18de7
smain@google.com [Fri, 19 Aug 2016 01:25:25 +0000 (01:25 +0000)]
fix redirect for AIDL doc bug:
5967288 am:
9ad944f8c9 am:
a4b2c2889b
am:
d6035bbbb7
Change-Id: Ic80e042070fa1bd15ab0638d6fd6bd686bf6b474
Jin Seok Park [Fri, 19 Aug 2016 01:19:25 +0000 (01:19 +0000)]
Merge "ExifInterface: Update Pixel X/Y Dimension tag values"
Scott Main [Fri, 19 Aug 2016 01:18:51 +0000 (01:18 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev am:
66ffbbfdf9
am:
6e10a6c034
Change-Id: I13a891f0d36eb885dada3e0b52839a4f26255cd7
smain@google.com [Fri, 19 Aug 2016 01:18:49 +0000 (01:18 +0000)]
fix redirect for AIDL doc bug:
5967288 am:
9ad944f8c9
am:
a4b2c2889b
Change-Id: Ib860989f17257b6bf7bc440543a01cf00ef37afa
Scott Main [Fri, 19 Aug 2016 01:12:12 +0000 (01:12 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev
am:
66ffbbfdf9
Change-Id: I9d9abedcd5721adbcfa4307794721a448bec80d4
smain@google.com [Fri, 19 Aug 2016 01:12:08 +0000 (01:12 +0000)]
fix redirect for AIDL doc bug:
5967288
am:
9ad944f8c9
Change-Id: I5a8bc81c442f54cce2a3b02e0a39e62a87f2d0d9
Scott Main [Fri, 19 Aug 2016 01:04:01 +0000 (01:04 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev
TreeHugger Robot [Fri, 19 Aug 2016 00:07:11 +0000 (00:07 +0000)]
Merge "Fixed NetworkStatsServiceTest and converted it to JUnit4."
Ajay Panicker [Thu, 18 Aug 2016 22:48:48 +0000 (22:48 +0000)]
Merge "Protect various Bluetooth broadcasts" am:
53ff75bb68 am:
779a1f096c am:
2bad652e56
am:
6c1035e0c5
Change-Id: I457daf895af6b23a4715f69e95d6f08b337b0b77
Felipe Leme [Thu, 18 Aug 2016 22:31:45 +0000 (15:31 -0700)]
Fixed NetworkStatsServiceTest and converted it to JUnit4.
Most tests were failing because due to a null NetworkCapabilities.
Example:
1) testNetworkStatsWifi(com.android.server.net.NetworkStatsServiceTest)
java.lang.NullPointerException: Attempt to invoke virtual method 'boolean android.net.NetworkCapabilities.hasCapability(int)' on a null object reference
at
com.android.server.net.NetworkStatsService.updateIfacesLocked(NetworkStatsService.java:983)
BUG:
30839080
Change-Id: Ib81d81df2828fc573c40b26c23af9d80ae43d3f6
George Mount [Thu, 18 Aug 2016 22:43:56 +0000 (22:43 +0000)]
Merge "Fix NPE during Activity transition using wrong Activity." into nyc-mr1-dev am:
2613fb543a am:
a1006363d2
am:
2cea825903
Change-Id: I81915b202d45f994770f3f6e4f5e7e4f0b356bfe
George Mount [Thu, 18 Aug 2016 22:43:53 +0000 (22:43 +0000)]
Fix NPE during Activity transition using wrong Activity. am:
a3edbf6a5d am:
34abaebd3b
am:
05051ef82b
Change-Id: Ic3fe31cb3bdad0efb2304064f7d488019e396cf5
Andy Hung [Thu, 18 Aug 2016 22:43:50 +0000 (22:43 +0000)]
Merge "AudioSystem: Verify audio port array information" into nyc-mr1-dev am:
47c7a8c19a am:
4b1d87eca6
am:
0be7421b1a
Change-Id: I182d2820a37b0cf71fd401d81e2b125f6e2fadb6
Andy Hung [Thu, 18 Aug 2016 22:43:46 +0000 (22:43 +0000)]
AudioSystem: Verify audio port array information am:
737d9fb181 am:
79d51bf46e
am:
2b971b3498
Change-Id: Id708d227d82924a249553e7db96845082ec2dd1b
Ajay Panicker [Thu, 18 Aug 2016 22:42:18 +0000 (22:42 +0000)]
Merge "Protect various Bluetooth broadcasts" am:
53ff75bb68 am:
779a1f096c
am:
2bad652e56
Change-Id: I342864675beb5083d67c3d74993995936a9af326
George Mount [Thu, 18 Aug 2016 22:37:25 +0000 (22:37 +0000)]
Merge "Fix NPE during Activity transition using wrong Activity." into nyc-mr1-dev am:
2613fb543a
am:
a1006363d2
Change-Id: I6f530895662f5e39a4fffb932c4139de54fd5b59
George Mount [Thu, 18 Aug 2016 22:37:21 +0000 (22:37 +0000)]
Fix NPE during Activity transition using wrong Activity. am:
a3edbf6a5d
am:
34abaebd3b
Change-Id: Ia21fab56d6ca3767d270e5336334dfb1e066bf5f
Andy Hung [Thu, 18 Aug 2016 22:37:16 +0000 (22:37 +0000)]
Merge "AudioSystem: Verify audio port array information" into nyc-mr1-dev am:
47c7a8c19a
am:
4b1d87eca6
Change-Id: Ia89aa1418f704935ac2364462634070ffab80e25
Andy Hung [Thu, 18 Aug 2016 22:37:12 +0000 (22:37 +0000)]
AudioSystem: Verify audio port array information am:
737d9fb181
am:
79d51bf46e
Change-Id: Ie74dc2cc9e8f8f9fca143f7cb83acec2b8af669b
Ajay Panicker [Thu, 18 Aug 2016 22:37:06 +0000 (22:37 +0000)]
Merge "Protect various Bluetooth broadcasts" am:
53ff75bb68
am:
779a1f096c
Change-Id: I979b7fcabc7e1f4714a88a632d3590304e1fb4fb
George Mount [Thu, 18 Aug 2016 22:32:14 +0000 (22:32 +0000)]
Merge "Fix NPE during Activity transition using wrong Activity." into nyc-mr1-dev
am:
2613fb543a
Change-Id: I82e061d321a935aed4ec9334b51c16d713991d67
Ajay Panicker [Thu, 18 Aug 2016 22:32:09 +0000 (22:32 +0000)]
Merge "Protect various Bluetooth broadcasts"
am:
53ff75bb68
Change-Id: Id4f77ea2092f9a04397fe596ed92f2f30a3235df
George Mount [Thu, 18 Aug 2016 22:32:08 +0000 (22:32 +0000)]
Fix NPE during Activity transition using wrong Activity.
am:
a3edbf6a5d
Change-Id: Ie6ca8f9f9f251eaf844f842e0f6f0ab36a975c1e
Andy Hung [Thu, 18 Aug 2016 22:32:00 +0000 (22:32 +0000)]
Merge "AudioSystem: Verify audio port array information" into nyc-mr1-dev
am:
47c7a8c19a
Change-Id: I8cb76567c8de112d4ac11fbdeaf8880b7ec7c7f9
Andy Hung [Thu, 18 Aug 2016 22:31:53 +0000 (22:31 +0000)]
AudioSystem: Verify audio port array information
am:
737d9fb181
Change-Id: I7a9eeeac4e0f02b4e045b7f277666bd4d3866441
George Mount [Thu, 18 Aug 2016 22:27:27 +0000 (22:27 +0000)]
Merge "Fix NPE during Activity transition using wrong Activity." into nyc-mr1-dev
Treehugger Robot [Thu, 18 Aug 2016 22:25:39 +0000 (22:25 +0000)]
Merge "Protect various Bluetooth broadcasts"
Andy Hung [Thu, 18 Aug 2016 22:25:17 +0000 (22:25 +0000)]
Merge "AudioSystem: Verify audio port array information" into nyc-mr1-dev
Sudheer Shanka [Thu, 18 Aug 2016 21:59:21 +0000 (21:59 +0000)]
Merge "Add unit tests for AppRestrictionsHelper."
smain@google.com [Thu, 18 Aug 2016 21:41:47 +0000 (14:41 -0700)]
fix redirect for AIDL doc
bug:
5967288
Change-Id: Ia2a4cbdde56d2e6baca4c5f74ea92bb7bfaf2938
Ned Burns [Thu, 18 Aug 2016 21:16:47 +0000 (21:16 +0000)]
Merge "Add ViewConfiguration.getScaledScrollFactor()"
TreeHugger Robot [Thu, 18 Aug 2016 21:05:59 +0000 (21:05 +0000)]
Merge "Add metrics for fragments in Settings."
John Reck [Thu, 18 Aug 2016 21:01:14 +0000 (21:01 +0000)]
Merge "Add TouchLatency test"
Ajay Panicker [Wed, 17 Aug 2016 22:36:24 +0000 (15:36 -0700)]
Protect various Bluetooth broadcasts
Bug:
30832954
Change-Id: I37e0b2ffab65c0703244917a4ade9bb8afbb5e6f
(cherry picked from commit
9a236066dbf604edfd5f873b4a3b94a200efd628)
Tim Murray [Thu, 18 Aug 2016 20:48:25 +0000 (20:48 +0000)]
Merge "Prevent FIFO threads from creating more FIFO threads." into nyc-mr1-dev am:
bb4e37c602 am:
6e23e43d54
am:
001e722652
Change-Id: I3da5946d080490d72b2cc6091f028b65625dc81f
Fan Zhang [Mon, 8 Aug 2016 21:03:53 +0000 (14:03 -0700)]
Add metrics for fragments in Settings.
Bug:
30681771
Test: compiled fine with proto changes.
Change-Id: I5b4669d13d58987c12dcc78ebdc4d7bd22916a71
Tim Murray [Thu, 18 Aug 2016 20:41:01 +0000 (20:41 +0000)]
Merge "Prevent FIFO threads from creating more FIFO threads." into nyc-mr1-dev am:
bb4e37c602
am:
6e23e43d54
Change-Id: Ibe675c0aebe95273ff12e2833b6668e0d3bc4bfa
Tim Murray [Thu, 18 Aug 2016 20:40:29 +0000 (20:40 +0000)]
Prevent FIFO threads from creating more FIFO threads. am:
38ee337f45 am:
0ceda0c956
am:
fcaf7176e3
Change-Id: I49b191890098e463af91039b4d0398cdbe37ed43
Tim Murray [Thu, 18 Aug 2016 20:35:12 +0000 (20:35 +0000)]
Prevent FIFO threads from creating more FIFO threads. am:
38ee337f45
am:
0ceda0c956
Change-Id: I71d40b4e0a8716cf1c1af5339de31d7edf744e43
Tim Murray [Thu, 18 Aug 2016 20:31:00 +0000 (20:31 +0000)]
Merge "Prevent FIFO threads from creating more FIFO threads." into nyc-mr1-dev
am:
bb4e37c602
Change-Id: Iea2f53fb8a62d3c59a10ca352a8485cd4d0ee326
Tim Murray [Thu, 18 Aug 2016 20:30:58 +0000 (20:30 +0000)]
Prevent FIFO threads from creating more FIFO threads.
am:
38ee337f45
Change-Id: Iecd7619faae5195934335afc0048cc5ddb6b9ab7
Tim Murray [Thu, 18 Aug 2016 20:25:36 +0000 (20:25 +0000)]
Merge "Prevent FIFO threads from creating more FIFO threads." into nyc-mr1-dev
Svetoslav Ganov [Thu, 18 Aug 2016 19:30:24 +0000 (19:30 +0000)]
Merge "Grab lock when accessing mutable state" into nyc-mr1-dev am:
6642c963d9 am:
decad179f6
am:
034906b65b
Change-Id: Ief59059b6b56e193097fdb511f9617678034ed86
Svet Ganov [Thu, 18 Aug 2016 19:30:19 +0000 (19:30 +0000)]
Grab lock when accessing mutable state am:
442ed57e4b am:
e1790d928f
am:
b8e820a2a8
Change-Id: I01e8027dde6568d3044aad03688d98c4e4789696
Svetoslav Ganov [Thu, 18 Aug 2016 19:22:28 +0000 (19:22 +0000)]
Merge "Grab lock when accessing mutable state" into nyc-mr1-dev am:
6642c963d9
am:
decad179f6
Change-Id: Ie4c013991ea3a57009926973441adcbeec38d56f
Svet Ganov [Thu, 18 Aug 2016 19:22:24 +0000 (19:22 +0000)]
Grab lock when accessing mutable state am:
442ed57e4b
am:
e1790d928f
Change-Id: If7d7e4f80f01b112d7a24993d28746c71ec85a17
Svetoslav Ganov [Thu, 18 Aug 2016 19:12:54 +0000 (19:12 +0000)]
Merge "Grab lock when accessing mutable state" into nyc-mr1-dev
am:
6642c963d9
Change-Id: Ibe00e1f3bdf916129355a38beece5378ec379a78
Svet Ganov [Thu, 18 Aug 2016 19:12:50 +0000 (19:12 +0000)]
Grab lock when accessing mutable state
am:
442ed57e4b
Change-Id: Ic8610ed5f0584150d7cda88761bff69dca8d1b42
TreeHugger Robot [Thu, 18 Aug 2016 19:10:27 +0000 (19:10 +0000)]
Merge "[NAN] Fix bad merge use rethrowFromSystemServer"
Ned Burns [Wed, 17 Aug 2016 21:30:25 +0000 (17:30 -0400)]
Add ViewConfiguration.getScaledScrollFactor()
This value is used to convert ACTION_SCROLL axis values into raw
pixel distances.
Change-Id: I537af010610bb374ab29a41aff4fae5b07bece6e
Svetoslav Ganov [Thu, 18 Aug 2016 19:05:47 +0000 (19:05 +0000)]
Merge "Grab lock when accessing mutable state" into nyc-mr1-dev
Ajay Panicker [Thu, 18 Aug 2016 18:50:21 +0000 (18:50 +0000)]
Protect various Bluetooth broadcasts am:
9a236066db am:
003342e425
am:
90af842f31
Change-Id: I1e1f501ad99f0b8d71bcacb0f22c64a56aaf669e
Ajay Panicker [Thu, 18 Aug 2016 18:46:50 +0000 (18:46 +0000)]
Protect various Bluetooth broadcasts am:
9a236066db
am:
003342e425
Change-Id: I854cce48aee3ec723ed520dd40af068d0907e11a
Ajay Panicker [Thu, 18 Aug 2016 18:40:25 +0000 (18:40 +0000)]
Protect various Bluetooth broadcasts
am:
9a236066db
Change-Id: I71a84c8486b70d6b94e9656a8a1299a9796d0d52
Dianne Hackborn [Thu, 18 Aug 2016 18:15:49 +0000 (18:15 +0000)]
Merge "Work on issue #
29939676: android.util.ArraySet static cache corruption"
Tim Murray [Thu, 18 Aug 2016 18:13:26 +0000 (11:13 -0700)]
Prevent FIFO threads from creating more FIFO threads.
SCHED_FIFO threads shouldn't be able to arbitrarily create more
SCHED_FIFO threads.
bug
30898724
Change-Id: I3704b47b88b573313e9b1610556648c8595d4108
George Mount [Tue, 16 Aug 2016 20:10:19 +0000 (13:10 -0700)]
Fix NPE during Activity transition using wrong Activity.
Bug
30786309
If the Activity used in makeSceneTransitionAnimation isn't
the same one used in the startActivity call, a NullPointerException
could be thrown.
Change-Id: Id21c54fcf99b353feab62f7fc160997ed06e7d23
(cherry picked from commit
3289bfa289f560d60611dddef9441c9614fd883a)
TreeHugger Robot [Thu, 18 Aug 2016 17:13:51 +0000 (17:13 +0000)]
Merge "Fix NPE during Activity transition using wrong Activity."
Ajay Panicker [Wed, 17 Aug 2016 22:36:24 +0000 (15:36 -0700)]
Protect various Bluetooth broadcasts
Bug:
30832954
Change-Id: I37e0b2ffab65c0703244917a4ade9bb8afbb5e6f
Daichi Hirono [Thu, 18 Aug 2016 06:13:36 +0000 (15:13 +0900)]
Set Root.FLAG_LOCAL_ONLY for MTP roots.
The flag indicate whether the root needs network access or not. MTP
should be LOCAL_ONLY root.
Bug:
30867267
Change-Id: Ia272d4a389cc1ca628d7b963caa37f3dbb6747e3
Narayan Kamath [Thu, 18 Aug 2016 16:40:25 +0000 (16:40 +0000)]
Merge "Process: Fix communication with zygote."
Phil Weaver [Thu, 18 Aug 2016 15:50:36 +0000 (15:50 +0000)]
Merge "Add null check in key event handling."
Narayan Kamath [Tue, 9 Aug 2016 16:00:25 +0000 (17:00 +0100)]
Process: Fix communication with zygote.
Don't write partial requests, and don't return (or throw) early after
partially reading a response.
bug:
30143607
(cherry picked from commit
448be0a62209c977593d81617853a8a428d013df)
Change-Id: Ib283b1620947151338f5f9473891a048a17d8f4a
Narayan Kamath [Thu, 18 Aug 2016 10:47:40 +0000 (10:47 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a am:
e24a4590bf am:
9988387315
am:
a66cffb3bc
Change-Id: If2db159da46a97ab7cace6371cb71b5dd74d9c61
Narayan Kamath [Thu, 18 Aug 2016 10:47:36 +0000 (10:47 +0000)]
Process: Fix communication with zygote. am:
448be0a622 am:
ac16712d8a am:
b9871c0dd3
am:
2295721ceb
Change-Id: I120081577b678f014d15b9a76f5276bf287335e9
Narayan Kamath [Thu, 18 Aug 2016 10:47:32 +0000 (10:47 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a am:
480f4a932e
am:
b19c604ae0
Change-Id: Ica6d1bc31d06d5a6d063ac297b72d55e76988812
Narayan Kamath [Thu, 18 Aug 2016 10:41:49 +0000 (10:41 +0000)]
Process: Fix communication with zygote. am:
448be0a622 am:
6bc7670c67
am:
156720056b -s ours
Change-Id: I9b512fe868b97f25e4989f596a68a0f51ad5c383
Narayan Kamath [Thu, 18 Aug 2016 10:33:08 +0000 (10:33 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a am:
e24a4590bf
am:
9988387315
Change-Id: I3d231654ed3c6264087f5b3a953f5e27d2c3d5ed
Narayan Kamath [Thu, 18 Aug 2016 10:32:57 +0000 (10:32 +0000)]
Process: Fix communication with zygote. am:
448be0a622 am:
ac16712d8a
am:
b9871c0dd3
Change-Id: I1fefed1f81ed0033ababf0847923a689a3ee4b5c
Narayan Kamath [Thu, 18 Aug 2016 10:25:56 +0000 (10:25 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a
am:
480f4a932e
Change-Id: Ibf3184b0e02c5b77d1fec5d8c2e2bcefe7100c3d
Narayan Kamath [Thu, 18 Aug 2016 10:25:53 +0000 (10:25 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a
am:
e24a4590bf
Change-Id: I933fe1f6f191e669a7a6ed4d00660a01f95feade
Narayan Kamath [Thu, 18 Aug 2016 10:25:53 +0000 (10:25 +0000)]
Process: Fix communication with zygote. am:
448be0a622
am:
6bc7670c67
Change-Id: I37ea2a3324277340fce69fcc6a5101bee0637dca
Narayan Kamath [Thu, 18 Aug 2016 10:25:51 +0000 (10:25 +0000)]
Process: Fix communication with zygote. am:
448be0a622
am:
ac16712d8a
Change-Id: Ief10a90dc77fa8e5cd562a39a6ddbad059353fdf
Narayan Kamath [Thu, 18 Aug 2016 10:20:01 +0000 (10:20 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
am:
cce8af824a
Change-Id: I728529bd6e54b7e1e220b62f6c84dc5e868d5ecc
Narayan Kamath [Thu, 18 Aug 2016 10:20:00 +0000 (10:20 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
am:
cce8af824a
Change-Id: I1086785cde9f5d9bbdff84b225c4d20582977c75
Narayan Kamath [Thu, 18 Aug 2016 10:19:58 +0000 (10:19 +0000)]
Process: Fix communication with zygote.
am:
448be0a622
Change-Id: Iabb68084827f798f25ebe870957074d152acaea4
Narayan Kamath [Thu, 18 Aug 2016 10:19:57 +0000 (10:19 +0000)]
Process: Fix communication with zygote.
am:
448be0a622
Change-Id: I5d496613f53c339c75a3293845670d9d8360c90f
Narayan Kamath [Thu, 18 Aug 2016 10:14:29 +0000 (10:14 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
Dmitriy Filchenko [Thu, 18 Aug 2016 03:36:21 +0000 (03:36 +0000)]
Merge "Remove unused includes." am:
35da832634 am:
33e65232f3 am:
eb349448aa
am:
185aff8565
Change-Id: I0e4bfc4f13b106ad63834192544395637887a8e2
Dmitriy Filchenko [Thu, 18 Aug 2016 03:33:20 +0000 (03:33 +0000)]
Merge "Remove unused includes." am:
35da832634 am:
33e65232f3
am:
eb349448aa
Change-Id: Ib07d472af12852399a80d5a6503c1c34a6c9380c
Dmitriy Filchenko [Thu, 18 Aug 2016 03:27:54 +0000 (03:27 +0000)]
Merge "Remove unused includes." am:
35da832634
am:
33e65232f3
Change-Id: I72e74566ed21f4aed4b2d6b4fa6e7ac1114a9f43
Dmitriy Filchenko [Thu, 18 Aug 2016 03:22:39 +0000 (03:22 +0000)]
Merge "Remove unused includes."
am:
35da832634
Change-Id: I5804c0ccf6c543471ddf3245a799d5fa651d6d18
Treehugger Robot [Thu, 18 Aug 2016 03:17:04 +0000 (03:17 +0000)]
Merge "Remove unused includes."
Jin Park [Thu, 18 Aug 2016 02:52:08 +0000 (11:52 +0900)]
ExifInterface: Update Pixel X/Y Dimension tag values
Current code checks Pixel X/Y Dimension tags when updating primary
image size values. This creates a problem when the image data are not
placed properly (IFD_TYPE_PRIMARY may need to be swapped with
IFD_TYPE_PREVIEW). This CL moves the updating code to after the
images have been properly placed.
Bug:
29409358
Change-Id: Ia70b5b292812c1e7812e9fc8ca2434998cf1b7f9
Dmitriy Filchenko [Thu, 18 Aug 2016 00:55:24 +0000 (17:55 -0700)]
Remove unused includes.
BUG:
29824203
Change-Id: I795f8abe31575f70da263921c6ec13b73b24dc7b
Bill Yi [Thu, 18 Aug 2016 01:37:52 +0000 (01:37 +0000)]
Import translations. DO NOT MERGE am:
9d652db6a4 -s ours am:
b024dd7501 -s ours
am:
ea943b38f3 -s ours
Change-Id: Ib81937eeaab654f0456504172adbf21aa0a5762a
Adam Lesinski [Thu, 18 Aug 2016 01:37:49 +0000 (01:37 +0000)]
Merge "AppIdleHistory: Only write screen on durations during regular sync" into nyc-mr1-dev am:
1af694510d am:
6d90bbbc6c
am:
9d80a7242c
Change-Id: I60bd78a9a12fd4bbd356128ec5d1ef265b5349e0
Adam Lesinski [Thu, 18 Aug 2016 01:37:46 +0000 (01:37 +0000)]
Merge "AppIdleHistory: Only write screen on durations during regular sync" into nyc-mr1-dev am:
1af694510d am:
65a12c15e7
am:
3221beabe6
Change-Id: I8c4ee616a81a1d22fa008501e55b563ca04eec35
Adam Lesinski [Thu, 18 Aug 2016 01:37:44 +0000 (01:37 +0000)]
AppIdleHistory: Only write screen on durations during regular sync am:
f2d87eba75 am:
a61092650c
am:
05f023dcd1
Change-Id: Ie3c9299f999e9c8bb7200606589f796598c64b55
Bill Yi [Thu, 18 Aug 2016 01:32:21 +0000 (01:32 +0000)]
Import translations. DO NOT MERGE am:
9d652db6a4 -s ours
am:
b024dd7501 -s ours
Change-Id: Id17a8898db1aaf4230d66d062884d0ac4b5d391f
Adam Lesinski [Thu, 18 Aug 2016 01:32:06 +0000 (01:32 +0000)]
Merge "AppIdleHistory: Only write screen on durations during regular sync" into nyc-mr1-dev am:
1af694510d
am:
6d90bbbc6c
Change-Id: I11da4168a11265690e27c00498f94eac363e4b64
Bill Yi [Thu, 18 Aug 2016 01:28:19 +0000 (01:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
4b30053ede -s ours
Change-Id: I28c7df17b56064d5d267de60a0821ebd409b910b
Bill Yi [Thu, 18 Aug 2016 01:28:18 +0000 (01:28 +0000)]
Import translations. DO NOT MERGE
am:
9d652db6a4 -s ours
Change-Id: If56739a9258c72a95dd7be524dd3b5c21bfd34ed
Adam Lesinski [Thu, 18 Aug 2016 01:27:52 +0000 (01:27 +0000)]
Merge "AppIdleHistory: Only write screen on durations during regular sync" into nyc-mr1-dev am:
1af694510d
am:
65a12c15e7
Change-Id: Ide64632d5351a5405f6ab98c09f16311fe71c821
Adam Lesinski [Thu, 18 Aug 2016 01:27:49 +0000 (01:27 +0000)]
AppIdleHistory: Only write screen on durations during regular sync am:
f2d87eba75
am:
a61092650c
Change-Id: Idb45fe9639dc8d81730a2c6c5c752d10d3fbb1e1
TreeHugger Robot [Thu, 18 Aug 2016 01:23:04 +0000 (01:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Adam Lesinski [Thu, 18 Aug 2016 01:19:56 +0000 (01:19 +0000)]
Merge "AppIdleHistory: Only write screen on durations during regular sync" into nyc-mr1-dev
am:
1af694510d
Change-Id: I60d96424e94226a85ef9fe79aba571b2329ee96e
OSDN Git Service
