Commit Graph

277484 Commits

Author SHA1 Message Date
Amanda Kassay
8f6d2bfe02 Wear Preview, auto, tv, versions project metadata. b/31771704 b/31903798 b/31773716 am: fd6846e116 am: a7e9861112 am: 5aab061303
am: ad45b14606

Change-Id: Ia13869de4921379925613a6e1c0c620fa7d15200
2016-10-06 21:44:11 +00:00
Android Build Merger (Role)
11f8c5381a Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5e6fb1699f -s ours am: dcc4542c05 -s ours" into nyc-mr1-dev-plus-aosp 2016-10-06 21:43:56 +00:00
Bill Yi
2d2d335631 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5e6fb1699f -s ours
am: dcc4542c05  -s ours

Change-Id: I6494116337bd418e34a2b532a5b8fe25e1f19f41
2016-10-06 21:43:10 +00:00
Android Build Merger (Role)
0c327cfc0d Merge "Import translations. DO NOT MERGE am: 41cf6c32a1 -s ours am: df10fcf220 -s ours" into nyc-mr1-dev-plus-aosp 2016-10-06 21:42:54 +00:00
Bill Yi
76dbadeb5d Import translations. DO NOT MERGE am: 41cf6c32a1 -s ours
am: df10fcf220  -s ours

Change-Id: I5086e374dfe2d69ffa6cede22e647594beeba8ae
2016-10-06 21:42:15 +00:00
Android Build Merger (Role)
59a9de0479 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f381889844 -s ours am: d8ae5393a8 -s ours" into nyc-mr1-dev-plus-aosp 2016-10-06 21:42:01 +00:00
Bill Yi
859d5217c0 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f381889844 -s ours
am: d8ae5393a8  -s ours

Change-Id: I81703238ee45d425d9962e9bcce76f135b6b6770
2016-10-06 21:41:11 +00:00
Android Build Merger (Role)
a6216703f0 Merge "Import translations. DO NOT MERGE am: e6327db2af -s ours am: 925f4f35b5 -s ours" into nyc-mr1-dev-plus-aosp 2016-10-06 21:40:59 +00:00
Bill Yi
54e34e9c7e Import translations. DO NOT MERGE am: e6327db2af -s ours
am: 925f4f35b5  -s ours

Change-Id: I83edac364921df0c78e2bd37399fac6a530dd43b
2016-10-06 21:40:16 +00:00
Android Build Merger (Role)
2a99707564 Merge "Change DEFAULT_BG_LOW_JOB_COUNT to 1 in JobSchedulerService. am: e39a8a46d9 am: ef866c3d0f" into nyc-mr1-dev-plus-aosp 2016-10-06 21:40:03 +00:00
Nancy Zheng
1076354748 Change DEFAULT_BG_LOW_JOB_COUNT to 1 in JobSchedulerService. am: e39a8a46d9
am: ef866c3d0f

Change-Id: Ib5aaaadc250458fa46b8b183b804be934c0f9bed
2016-10-06 21:39:22 +00:00
Hall Liu
0fe683da4d Merge "Add logging to CallerInfoAsyncQuery" into nyc-mr1-dev 2016-10-06 21:39:05 +00:00
Android Build Merger (Role)
9332ab9524 Merge "Merge "Make umbra lighter when the blocker is too high and has no real umbra area." into nyc-mr1-dev am: 8e93abcd6c am: f8bfc7890f" into nyc-mr1-dev-plus-aosp 2016-10-06 21:39:03 +00:00
Tenghui Zhu
da3f7d8e0c Merge "Make umbra lighter when the blocker is too high and has no real umbra area." into nyc-mr1-dev am: 8e93abcd6c
am: f8bfc7890f

Change-Id: I681e454b90d6f7dc36bc363e3eaed3ceb9f58ab1
2016-10-06 21:38:19 +00:00
Android Build Merger (Role)
304228628f Merge "Make umbra lighter when the blocker is too high and has no real umbra area. am: 9c555566bf am: 9ad599930d" into nyc-mr1-dev-plus-aosp 2016-10-06 21:38:03 +00:00
Teng-Hui Zhu
6ff1730df5 Make umbra lighter when the blocker is too high and has no real umbra area. am: 9c555566bf
am: 9ad599930d

Change-Id: I930f1ea0a3620bfdb87e703bbdf927cdde7b809a
2016-10-06 21:37:17 +00:00
Android Build Merger (Role)
83c9edc8d1 Merge "Merge "Revert "Bump up preloading recents on boot up to user unlocked."" into nyc-mr1-dev am: e8ebe11209 am: f4e866947f" into nyc-mr1-dev-plus-aosp 2016-10-06 21:37:02 +00:00
Winson Chung
aab11a8c45 Merge "Revert "Bump up preloading recents on boot up to user unlocked."" into nyc-mr1-dev am: e8ebe11209
am: f4e866947f

Change-Id: I6fa7769c64e0a461fd9a8ff62aa80f0cd63c90ab
2016-10-06 21:36:19 +00:00
Android Build Merger (Role)
478ed50d09 Merge "Revert "Bump up preloading recents on boot up to user unlocked." am: 501d59dcea am: 1fb2e3db87" into nyc-mr1-dev-plus-aosp 2016-10-06 21:36:01 +00:00
Winson Chung
a6712f2872 Revert "Bump up preloading recents on boot up to user unlocked." am: 501d59dcea
am: 1fb2e3db87

Change-Id: I5036fb13c02b91ec13138eba86b6bd9f617ed552
2016-10-06 21:35:27 +00:00
Android Build Merger (Role)
ebd1264769 Merge "Merge "Ambient: Re-register all trigger sensors if one fires" into nyc-mr1-dev am: b9bb518632 am: 1a299d8052" into nyc-mr1-dev-plus-aosp 2016-10-06 21:35:12 +00:00
Adrian Roos
84aa0f1233 Merge "Ambient: Re-register all trigger sensors if one fires" into nyc-mr1-dev am: b9bb518632
am: 1a299d8052

Change-Id: Ie2b03efcaebd3337cbe5b2945f812e76d7327604
2016-10-06 21:34:31 +00:00
Android Build Merger (Role)
7f49d4dddd Merge "Ambient: Re-register all trigger sensors if one fires am: 0288dcc825 am: 7157eb844a" into nyc-mr1-dev-plus-aosp 2016-10-06 21:34:10 +00:00
Adrian Roos
6041995002 Ambient: Re-register all trigger sensors if one fires am: 0288dcc825
am: 7157eb844a

Change-Id: I0c4d238f87d0a88c69d28a93bd6218f899a24a5a
2016-10-06 21:33:30 +00:00
Android Build Merger (Role)
763f131810 Merge "Merge "Doc change: remove intl/nn from collections paths." into nyc-dev am: 794e0d3578 am: fc7475c5b3 am: 5d6be1abca am: ce9fda304c" into nyc-mr1-dev-plus-aosp 2016-10-06 21:33:13 +00:00
Dirk Dougherty
92ba0420a2 Merge "Doc change: remove intl/nn from collections paths." into nyc-dev am: 794e0d3578 am: fc7475c5b3 am: 5d6be1abca
am: ce9fda304c

Change-Id: Iad1f0f43bf1d645ef41ff38d0788823466fbc41f
2016-10-06 21:32:36 +00:00
Android Build Merger (Role)
cc3e1ba191 Merge "Doc change: remove intl/nn from collections paths. am: 240ddd735c am: 016f01ebfe am: 7ceecc61ec am: 256dfeea14" into nyc-mr1-dev-plus-aosp 2016-10-06 21:32:15 +00:00
Dirk Dougherty
eccdec22b1 Doc change: remove intl/nn from collections paths. am: 240ddd735c am: 016f01ebfe am: 7ceecc61ec
am: 256dfeea14

Change-Id: Iaf5532f2978482c63d0720b63aff51a1bbf9fc51
2016-10-06 21:31:28 +00:00
Android Build Merger (Role)
56f2d07b29 Merge "Merge "Update preview-community redirect to point at +AD." into nyc-dev am: 61d3faa52c am: 8f8fe7df92 am: 7f5f8b1df8 am: 7c2e40c715" into nyc-mr1-dev-plus-aosp 2016-10-06 21:31:12 +00:00
Dirk Dougherty
a138d7b18f Merge "Update preview-community redirect to point at +AD." into nyc-dev am: 61d3faa52c am: 8f8fe7df92 am: 7f5f8b1df8
am: 7c2e40c715

Change-Id: I68bc342d2a6f741a4c6660f29e929e717f651293
2016-10-06 21:30:33 +00:00
Android Build Merger (Role)
d12ea892c0 Merge "Update preview-community redirect to point at +AD. am: 559013e711 am: 1241838fb4 am: ddd2e0442e am: c96f065bce" into nyc-mr1-dev-plus-aosp 2016-10-06 21:30:13 +00:00
Dirk Dougherty
7218e6b96f Update preview-community redirect to point at +AD. am: 559013e711 am: 1241838fb4 am: ddd2e0442e
am: c96f065bce

Change-Id: I7af8fad20356137bdb481454a72c69397f0f647a
2016-10-06 21:29:29 +00:00
Android Build Merger (Role)
617e324e98 Merge "Merge "Fix issue #31305336: File corrupt: too many wake locks 101" into nyc-mr1-dev am: 534a17e96c am: 6420ce51d0" into nyc-mr1-dev-plus-aosp 2016-10-06 21:29:10 +00:00
Dianne Hackborn
2539e81a75 Merge "Fix issue #31305336: File corrupt: too many wake locks 101" into nyc-mr1-dev am: 534a17e96c
am: 6420ce51d0

Change-Id: I9782662b026388f05d6ad06a4275405f169db030
2016-10-06 21:28:34 +00:00
Android Build Merger (Role)
dc97314a0e Merge "Merge "Correctly pass number of input allocations for BLAS" am: 8d08d0fa83 am: e443dd04b0 am: e59e92d497" into nyc-mr1-dev-plus-aosp 2016-10-06 21:28:21 +00:00
Miao Wang
658c67b7ff Merge "Correctly pass number of input allocations for BLAS" am: 8d08d0fa83 am: e443dd04b0
am: e59e92d497

Change-Id: Ie9236113ec899ab9ba1ecebf15739e161aa206ac
2016-10-06 21:27:42 +00:00
Dianne Hackborn
a89e1ec692 Fix issue #31305336: File corrupt: too many wake locks 101 am: cb99a72e62
am: 50b9f3513c

Change-Id: Idfc3a5413248ac0b74f88d21a9f1f4f642b3f73c
2016-10-06 21:27:35 +00:00
Wei Liu
93096a7479 Merge "Allow shell to acquire wakelock. DO NOT MERGE." into nyc-mr1-dev am: 30a0f96250
am: 99892beb39

Change-Id: I0b77ca3e14678a6eff608ca7c0279fe7ee9d430e
2016-10-06 21:26:51 +00:00
Wei Liu
637a0cc98a Allow shell to acquire wakelock. DO NOT MERGE. am: 898468657e
am: ec7c07e2a5

Change-Id: I2dc33af5b2e19f07c5ae908f4cfa1a2bd24aef76
2016-10-06 21:25:07 +00:00
Christopher Tate
893930630f Eliminate unnecessary object churn in job scheduler updating am: eafb535072
am: 84e9961a7c

Change-Id: I1df15d655f7782f3cc8ecd051ad3f0268ae8b7a7
2016-10-06 21:24:04 +00:00
Paul Stewart
bce0a8dd0c Merge "Tethering: check if configManager is null" into nyc-mr1-dev am: 7d25ab7b11
am: 7a587e85cd

Change-Id: I1f8ceb90fae45347a051fb766a462bc3fd9b1eaf
2016-10-06 21:23:08 +00:00
Rebecca Silberstein
5e935709ce Tethering: check if configManager is null am: b07f140904
am: 7aca691f27

Change-Id: I22beafaea3a01e5475d1eb3904b7ceb41dc98eaa
2016-10-06 21:22:12 +00:00
Miao Wang
e59e92d497 Merge "Correctly pass number of input allocations for BLAS" am: 8d08d0fa83
am: e443dd04b0

Change-Id: I4194799c54c065dd239a4f635af05d99e67a6996
2016-10-06 21:22:05 +00:00
Rob Carr
972c86df31 Merge changes I99f18930,I5f6830d8 into nyc-mr1-dev am: c65dc5529e
am: 2c1a026ee5

Change-Id: I6be8174475b7fce7b6c488cad3a9a2d2a633a24d
2016-10-06 21:20:32 +00:00
Robert Carr
5e664d9957 Prevent any rotation while seamless rotation is pending. am: b14d4abc16
am: eb461fca5a

Change-Id: Id88cf66355fccf6d141f7177f4323124efec7e9c
2016-10-06 21:19:21 +00:00
Robert Carr
7dc3a76dbf Prevent triggering orientation changes until previous completes. am: 45f6a2718a
am: 3165c49908

Change-Id: I9cd27eefc303344262798e067326bf89c601daab
2016-10-06 21:18:29 +00:00
Miao Wang
e443dd04b0 Merge "Correctly pass number of input allocations for BLAS"
am: 8d08d0fa83

Change-Id: Ia2624e12f3122119814f082f24e02052a19ecd9c
2016-10-06 21:15:07 +00:00
Sid Soundararajan
7e5d8b4bb0 Merge "Recents TV: Do not allow negative delay" into nyc-mr1-dev
am: 3e0427e4f8

Change-Id: I88d9838788d75b36d0fa74a8d0561c5bc77066f0
2016-10-06 21:14:17 +00:00
Sid Soundararajan
f9ea846482 Recents TV: Do not allow negative delay
am: a4a4763f58

Change-Id: I7146115b4f9e07c5574127909509d66db9cfab05
2016-10-06 21:14:14 +00:00
Chris Tate
35bf3b9ab8 Merge "Fix job scheduler crash due to uninstall race" into nyc-mr1-dev
am: 24ab3aafe2

Change-Id: I7769bf73bd19e17818a7b36cad6f33a6a417e6b2
2016-10-06 21:13:02 +00:00