OSDN Git Service
Android Build Merger (Role) [Tue, 12 Jul 2016 20:08:26 +0000 (20:08 +0000)]
Merge "Merge \\\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e am:
fd0757f195 -s ours am:
7975dd5b48 am:
008d66e49c am:
e8458d8f88 am:
1bb51deaf4 -s ours am:
5441a248f4 am:
903fb640c6" into nyc-mr1-dev-plus-aosp
Sudheer Shanka [Tue, 12 Jul 2016 20:08:00 +0000 (20:08 +0000)]
Merge \\\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e am:
fd0757f195 -s ours am:
7975dd5b48 am:
008d66e49c am:
e8458d8f88 am:
1bb51deaf4 -s ours am:
5441a248f4
am:
903fb640c6
Change-Id: I8c118f5df4f8b8f1122628517ed9be9b10d918bb
Sudheer Shanka [Tue, 12 Jul 2016 20:06:53 +0000 (20:06 +0000)]
Merge \\\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9 am:
76c9d70756 -s ours am:
6ae7a5f72b am:
322e70cef3 am:
a730e5977e am:
cbe258aa27 -s ours am:
5b28589127
am:
45393c8b85
Change-Id: Ied475a3054b317b91a5e10108f9a271b41e81422
Sudheer Shanka [Tue, 12 Jul 2016 20:06:51 +0000 (20:06 +0000)]
Merge \\\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e am:
fd0757f195 -s ours am:
7975dd5b48 am:
008d66e49c am:
e8458d8f88 am:
1bb51deaf4 -s ours am:
5441a248f4
am:
8fed0636c8
Change-Id: I79ef5d60a2357ad717cce1cb0e717a06dc785c52
Sudheer Shanka [Tue, 12 Jul 2016 20:01:04 +0000 (20:01 +0000)]
Merge \\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e am:
fd0757f195 -s ours am:
7975dd5b48 am:
008d66e49c am:
e8458d8f88 am:
1bb51deaf4 -s ours
am:
5441a248f4
Change-Id: Ib4f04849819432248e069997659215ecf2840e67
Sudheer Shanka [Tue, 12 Jul 2016 19:59:12 +0000 (19:59 +0000)]
Merge \\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9 am:
76c9d70756 -s ours am:
6ae7a5f72b am:
322e70cef3 am:
a730e5977e am:
cbe258aa27 -s ours
am:
5b28589127
Change-Id: Id67b945304514fb291021ad30835ecb8f04e0cfb
Sudheer Shanka [Tue, 12 Jul 2016 19:59:08 +0000 (19:59 +0000)]
Merge \\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e am:
fd0757f195 -s ours am:
7975dd5b48 am:
008d66e49c am:
e8458d8f88 am:
1bb51deaf4 -s ours
am:
5441a248f4
Change-Id: I2441f27ef71cd55f302821f429995414c997c222
Sudheer Shanka [Tue, 12 Jul 2016 19:52:48 +0000 (19:52 +0000)]
Merge \\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9 am:
76c9d70756 -s ours am:
6ae7a5f72b am:
322e70cef3 am:
a730e5977e
am:
cbe258aa27 -s ours
Change-Id: I1cd45ce38ea1859fef073124cd3362076b2c33e4
Sudheer Shanka [Tue, 12 Jul 2016 19:52:44 +0000 (19:52 +0000)]
Merge \\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e am:
fd0757f195 -s ours am:
7975dd5b48 am:
008d66e49c am:
e8458d8f88
am:
1bb51deaf4 -s ours
Change-Id: I82e3b82dd260fef67e4c17156d9a868771e70e61
Sudheer Shanka [Tue, 12 Jul 2016 19:47:49 +0000 (19:47 +0000)]
Merge \\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9 am:
76c9d70756 -s ours am:
6ae7a5f72b am:
322e70cef3
am:
a730e5977e
Change-Id: Ic3f93423fed99fe6e1b1142e9f949866897954ae
Sudheer Shanka [Tue, 12 Jul 2016 19:47:44 +0000 (19:47 +0000)]
Merge \\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e am:
fd0757f195 -s ours am:
7975dd5b48 am:
008d66e49c
am:
e8458d8f88
Change-Id: If984b3437bc60d99e693907aef24f3b7b1218836
Sudheer Shanka [Tue, 12 Jul 2016 19:42:40 +0000 (19:42 +0000)]
Merge \\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9 am:
76c9d70756 -s ours am:
6ae7a5f72b
am:
322e70cef3
Change-Id: I8c18ad1a029c13f1be022e12031f29d3cbba2220
Sudheer Shanka [Tue, 12 Jul 2016 19:42:38 +0000 (19:42 +0000)]
Merge \\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e am:
fd0757f195 -s ours am:
7975dd5b48
am:
008d66e49c
Change-Id: I18ca4b24a2e18b122106027568cb92e3a10822ca
Sudheer Shanka [Tue, 12 Jul 2016 19:34:39 +0000 (19:34 +0000)]
Merge \\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9 am:
76c9d70756 -s ours
am:
6ae7a5f72b
Change-Id: I89dd8c81075ebc85173c5fc37e8a4d1dfe312bbb
Sudheer Shanka [Tue, 12 Jul 2016 19:34:38 +0000 (19:34 +0000)]
Merge \\\\"DO NOT MERGE: Reduce shell power over user management.\\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e am:
fd0757f195 -s ours
am:
7975dd5b48
Change-Id: I343863180866b38af4f91a6f79068c21096e7ce0
Jason Monk [Tue, 12 Jul 2016 19:30:14 +0000 (19:30 +0000)]
Merge \"SysUI: Protect against crash in BatteryController\" into nyc-mr1-dev
am:
3750c9a15a
Change-Id: Idc0701fd53702bc2f0a4c4e4cb3173393cb24fa7
Fyodor Kupolov [Tue, 12 Jul 2016 19:30:08 +0000 (19:30 +0000)]
Merge \"Don\'t hold a lock while loading default wallpaper\" into nyc-mr1-dev
am:
2921dfac50
Change-Id: Iaa22bed019f30b340d7ef7011c2d8b14629efe33
Sudheer Shanka [Tue, 12 Jul 2016 19:27:39 +0000 (19:27 +0000)]
Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9
am:
76c9d70756 -s ours
Change-Id: I860be1d599fe60603b37ba8388a20c44c37d6f68
Sudheer Shanka [Tue, 12 Jul 2016 19:27:37 +0000 (19:27 +0000)]
Merge \\\"DO NOT MERGE: Reduce shell power over user management.\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e
am:
fd0757f195 -s ours
Change-Id: I17b97d1cfefa769b07ea798c6f87f8af22a31329
Sudheer Shanka [Tue, 12 Jul 2016 19:20:38 +0000 (19:20 +0000)]
Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-mr1-dev am:
d327d73edf
am:
cb7e0643c9
Change-Id: I42d732fcc3ed8745dcc35e433e066ee8babe3e42
Sudheer Shanka [Tue, 12 Jul 2016 19:20:34 +0000 (19:20 +0000)]
Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-mr1-dev am:
f1d9152f9f
am:
177422c91e
Change-Id: I7de2c4181d5b42e505310b4639eb82719ae42c16
Jason Monk [Tue, 12 Jul 2016 19:18:50 +0000 (19:18 +0000)]
Merge "SysUI: Protect against crash in BatteryController" into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 19:18:07 +0000 (19:18 +0000)]
Merge "Don't hold a lock while loading default wallpaper" into nyc-mr1-dev
Sudheer Shanka [Tue, 12 Jul 2016 19:11:37 +0000 (19:11 +0000)]
Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-mr1-dev
am:
d327d73edf
Change-Id: I131a01fb8d4ccd440a7727df2fde0ce433bc30d1
Sudheer Shanka [Tue, 12 Jul 2016 19:11:35 +0000 (19:11 +0000)]
Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-mr1-dev
am:
f1d9152f9f
Change-Id: I61633ebe7944d54f3da36eedaf4bab7308ff3c96
Christopher Tate [Tue, 12 Jul 2016 19:08:18 +0000 (19:08 +0000)]
Merge \"Back up / restore lock wallpapers\" into nyc-mr1-dev
am:
2917abeef2
Change-Id: I85f0dbff5a5b50e57892553ae36459dd7594d736
Christopher Tate [Tue, 12 Jul 2016 19:08:15 +0000 (19:08 +0000)]
Merge \"Don\'t walk mutexed collections outside the mutex\" into nyc-mr1-dev
am:
b9c057c316
Change-Id: I51a2f7324e96327a1d5e2f826544f03309412081
Christopher Tate [Tue, 12 Jul 2016 19:08:08 +0000 (19:08 +0000)]
Merge \"Fix up mangled SELinux labeling of wallpaper files\" into nyc-mr1-dev
am:
87488ac89b
Change-Id: Ib983d7f56e21ae61679edb89e5c2373c7e7c08d9
Sudheer Shanka [Tue, 12 Jul 2016 19:03:18 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-mr1-dev
Sudheer Shanka [Tue, 12 Jul 2016 19:03:12 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-mr1-dev
Chris Tate [Tue, 12 Jul 2016 18:56:45 +0000 (18:56 +0000)]
Merge "Back up / restore lock wallpapers" into nyc-mr1-dev
Chris Tate [Tue, 12 Jul 2016 18:56:24 +0000 (18:56 +0000)]
Merge "Don't walk mutexed collections outside the mutex" into nyc-mr1-dev
Chris Tate [Tue, 12 Jul 2016 18:56:19 +0000 (18:56 +0000)]
Merge "Fix up mangled SELinux labeling of wallpaper files" into nyc-mr1-dev
Christopher Tate [Tue, 28 Jun 2016 23:38:40 +0000 (16:38 -0700)]
Back up / restore lock wallpapers
If writing both system + lock wallpapers winds up hitting the
transport-defined quota, the next backup operation steps back
to storing only the system wallpaper.
Also makes sure to unbind full-backup target agents following
the backup operation. In practice this usually doesn't matter
because the target gets killed following the operation, but
the wallpaper agent runs in the system process where this does
not happen, so was mistakenly being left in place and reused
for the next operation, failing to re-run the full create +
backup lifecycle.
Bug
28968107
Change-Id: I219c2ddd7e899a430ef4cf693b1259464c15eed5
Alan Viverette [Tue, 12 Jul 2016 18:23:01 +0000 (18:23 +0000)]
Merge \"Set up view state before attaching, jump drawables if needed\" into nyc-mr1-dev
am:
2c5da6668c
Change-Id: I1377f24fbf1a9f95072c14c9518261ad3591323f
Alan Viverette [Tue, 12 Jul 2016 18:13:20 +0000 (18:13 +0000)]
Merge "Set up view state before attaching, jump drawables if needed" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 12 Jul 2016 18:06:20 +0000 (18:06 +0000)]
Merge "Merge \\"docs: Removed self-referencing links on Apps and Games pages.\\" into nyc-dev am:
4c8d924d4c am:
05d6cc78de" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Tue, 12 Jul 2016 18:05:57 +0000 (18:05 +0000)]
Merge \\"docs: Removed self-referencing links on Apps and Games pages.\\" into nyc-dev am:
4c8d924d4c
am:
05d6cc78de
Change-Id: I1317ab8eda6fbd6ac1d84d54402f85faf9d4fb90
Kevin Hufnagle [Tue, 12 Jul 2016 18:04:43 +0000 (18:04 +0000)]
Merge \\"docs: Removed self-referencing links on Apps and Games pages.\\" into nyc-dev am:
4c8d924d4c
am:
c4a48eaad0
Change-Id: Ia6b8db8eb126412471d94a3918c5a4756c65cac0
Android Build Merger (Role) [Tue, 12 Jul 2016 17:57:52 +0000 (17:57 +0000)]
Merge "Merge \\"Include new constant for encryption status in the getter\\'s javadoc\\" into nyc-dev am:
e278cf7665 am:
c6b85035b4" into nyc-mr1-dev-plus-aosp
Amith Yamasani [Tue, 12 Jul 2016 17:57:31 +0000 (17:57 +0000)]
Merge \\"Include new constant for encryption status in the getter\\'s javadoc\\" into nyc-dev am:
e278cf7665
am:
c6b85035b4
Change-Id: Ib7084c7f4834b682d44e1a6e1c9d71a53a82f438
Amith Yamasani [Tue, 12 Jul 2016 17:55:05 +0000 (17:55 +0000)]
Merge \"Merge \\"Include new constant for encryption status in the getter\\'s javadoc\\" into nyc-dev am:
e278cf7665\" into nyc-mr1-dev
am:
d2e6a62838
Change-Id: I5d11b5f95bab3f5b581f0fab176efc5c349adb55
Julia Reynolds [Tue, 12 Jul 2016 17:55:00 +0000 (17:55 +0000)]
Merge \"Improve jank on header change.\" into nyc-mr1-dev
am:
7ac1886ae9
Change-Id: I4c57aff5f779998f4bf8b79c74692a2e7f764ac8
Kevin Hufnagle [Tue, 12 Jul 2016 17:54:26 +0000 (17:54 +0000)]
Merge \"docs: Removed self-referencing links on Apps and Games pages.\" into nyc-dev
am:
4c8d924d4c
Change-Id: I84f8209ce4c1f2a85c02398b3e7e7c30953cefd3
Kevin Hufnagle [Tue, 12 Jul 2016 17:54:18 +0000 (17:54 +0000)]
Merge \"docs: Removed self-referencing links on Apps and Games pages.\" into nyc-dev
am:
4c8d924d4c
Change-Id: I8d8fca3aae027c6130590fae763fdba2a9f207b1
Kevin Hufnagle [Tue, 12 Jul 2016 17:49:09 +0000 (17:49 +0000)]
Merge "docs: Removed self-referencing links on Apps and Games pages." into nyc-dev
Android Build Merger (Role) [Tue, 12 Jul 2016 17:47:24 +0000 (17:47 +0000)]
Merge "Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev am:
e278cf7665" into nyc-mr1-dev
Julia Reynolds [Tue, 12 Jul 2016 17:47:20 +0000 (17:47 +0000)]
Merge "Improve jank on header change." into nyc-mr1-dev
Amith Yamasani [Tue, 12 Jul 2016 17:47:05 +0000 (17:47 +0000)]
Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev
am:
e278cf7665
Change-Id: Idd28d2ca2f46e8745392b5194dd2c8c370213ff7
Amith Yamasani [Tue, 12 Jul 2016 17:46:58 +0000 (17:46 +0000)]
Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev
am:
e278cf7665
Change-Id: I22c884f8982d3a1aaf7baf1b981a3d3d8d8ab624
Amith Yamasani [Tue, 12 Jul 2016 17:40:12 +0000 (17:40 +0000)]
Merge "Include new constant for encryption status in the getter's javadoc" into nyc-dev
Fyodor Kupolov [Tue, 12 Jul 2016 17:32:08 +0000 (10:32 -0700)]
Don't hold a lock while loading default wallpaper
It currently causes lock contention during user switch, when instance of
WallpaperManager in SystemUI is accessed from multiple threads
Bug:
29039588
Change-Id: I4b827d54d10fbd3b188fb94f47e78a2967ecb480
Geoffrey Pitsch [Tue, 12 Jul 2016 17:37:30 +0000 (17:37 +0000)]
Merge \"OpenSL-based audio support for BootAnimation\" into nyc-mr1-dev
am:
859029ff7b
Change-Id: Idecb0041af13b9d263568c078bc0461ebb19e4ed
Jason Monk [Tue, 12 Jul 2016 17:34:12 +0000 (13:34 -0400)]
SysUI: Protect against crash in BatteryController
Change-Id: I850177b961b59b342dde4dbf67c018ac68a42960
Fixes:
30033957
Geoffrey Pitsch [Tue, 12 Jul 2016 17:29:55 +0000 (17:29 +0000)]
Merge "OpenSL-based audio support for BootAnimation" into nyc-mr1-dev
Makoto Onuki [Tue, 12 Jul 2016 17:14:56 +0000 (17:14 +0000)]
Merge \"Throw ActivityNotFoundException when failed to launch shortcut\" into nyc-mr1-dev
am:
50752f7391
Change-Id: I0dcb7b89a32de22dee41ebe617e47ae935ac8227
Makoto Onuki [Tue, 12 Jul 2016 17:09:31 +0000 (17:09 +0000)]
Merge "Throw ActivityNotFoundException when failed to launch shortcut" into nyc-mr1-dev
Rubin Xu [Tue, 12 Jul 2016 16:51:41 +0000 (16:51 +0000)]
Merge \"Guard against null object in scheduleNotifyUpdateAppWidgetLocked\" into nyc-mr1-dev
am:
26504a611a
Change-Id: I91941346d3e376dd2813bcbb0b6f6fbd1cc5357f
Brad Ebinger [Tue, 12 Jul 2016 16:44:13 +0000 (16:44 +0000)]
Merge \"Add Group Id to PhoneAccount\" into nyc-mr1-dev
am:
60bbfacd4e
Change-Id: Ia0d4284c4e776da86e3213227f75e8bdcfef5c26
Bill Yi [Tue, 12 Jul 2016 16:44:00 +0000 (16:44 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
a2e1bb8c3e -s ours
am:
8d06bbf201 -s ours
Change-Id: I36cfe7b2c938cf8bb8d22fc65c9d25e04197d61d
Bill Yi [Tue, 12 Jul 2016 16:43:52 +0000 (16:43 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
84c67fa304 -s ours
am:
4ae2cc3803 -s ours
Change-Id: I6b9e92250f1f101a1813685989b353a95784e176
Julia Reynolds [Tue, 12 Jul 2016 15:30:28 +0000 (11:30 -0400)]
Improve jank on header change.
Also fix expand icon ripple.
Bug:
30070005
Change-Id: I0a139778f14d5ba4ebee6e27a321af3827ecbe96
Android Build Merger (Role) [Tue, 12 Jul 2016 16:39:13 +0000 (16:39 +0000)]
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
a2e1bb8c3e -s ours am:
7d8fe60299 -s ours" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 12 Jul 2016 16:39:05 +0000 (16:39 +0000)]
Merge "Merge \\"docs: July 2016 Dashboard update\\" into nyc-dev am:
ba64d0ec2e am:
b7c43bc613" into nyc-mr1-dev-plus-aosp
Bill Yi [Tue, 12 Jul 2016 16:38:15 +0000 (16:38 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
a2e1bb8c3e -s ours
am:
7d8fe60299 -s ours
Change-Id: Id36fc37ef69e00b795fee823fd86b1fecb9b6df1
Joe Fernandez [Tue, 12 Jul 2016 16:38:12 +0000 (16:38 +0000)]
Merge \\"docs: July 2016 Dashboard update\\" into nyc-dev am:
ba64d0ec2e
am:
b7c43bc613
Change-Id: Id255b6d8689ca86b556a9eadb0743a859f641a0c
Bill Yi [Tue, 12 Jul 2016 16:38:11 +0000 (16:38 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
84c67fa304 -s ours
am:
f25fae7ea5 -s ours
Change-Id: I83d520d76aa9e4a285fc8b67cb14f7cb4e107fd6
Joe Fernandez [Tue, 12 Jul 2016 16:38:08 +0000 (16:38 +0000)]
Merge \\"docs: July 2016 Dashboard update\\" into nyc-dev am:
ba64d0ec2e
am:
599bf18cbd
Change-Id: If78e3dbb78c5815e46c6f01a03a6748bf4f14f1c
Rubin Xu [Tue, 12 Jul 2016 16:37:54 +0000 (16:37 +0000)]
Merge "Guard against null object in scheduleNotifyUpdateAppWidgetLocked" into nyc-mr1-dev
Brad Ebinger [Tue, 12 Jul 2016 16:33:41 +0000 (16:33 +0000)]
Merge "Add Group Id to PhoneAccount" into nyc-mr1-dev
Bill Yi [Tue, 12 Jul 2016 16:29:30 +0000 (16:29 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
a2e1bb8c3e -s ours
Change-Id: Iff3609179536b7e76d0f2a0b221636d86f7b6a51
Bill Yi [Tue, 12 Jul 2016 16:29:28 +0000 (16:29 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
84c67fa304 -s ours
Change-Id: I8da6418636bc11f64c226c8c3d995f7440ed04f7
Joe Fernandez [Tue, 12 Jul 2016 16:29:25 +0000 (16:29 +0000)]
Merge \"docs: July 2016 Dashboard update\" into nyc-dev
am:
ba64d0ec2e
Change-Id: Idc78d3c900d6aef1ff78183bd3f187def98aed0c
Android Build Merger (Role) [Tue, 12 Jul 2016 16:29:12 +0000 (16:29 +0000)]
Merge "Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev am:
86f7155e6f -s ours" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 12 Jul 2016 16:29:00 +0000 (16:29 +0000)]
Merge "Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev am:
a8b4e7320a -s ours" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 12 Jul 2016 16:28:44 +0000 (16:28 +0000)]
Merge "Merge \"Merge \\"App launch - Test app changes\\" into nyc-dev am:
8fabbb89c0\" into nyc-mr1-dev am:
3998b7a54b" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 12 Jul 2016 16:28:32 +0000 (16:28 +0000)]
Merge "Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev am:
fd3dc6d96d -s ours" into nyc-mr1-dev-plus-aosp
Bill Yi [Tue, 12 Jul 2016 16:27:41 +0000 (16:27 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
86f7155e6f -s ours
Change-Id: I93d1e66cc995a91f51bca4bb2aaf42554170a527
Bill Yi [Tue, 12 Jul 2016 16:27:38 +0000 (16:27 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
a8b4e7320a -s ours
Change-Id: Ia3155124b7367bfec936160db2ce5fbc14ae6cb1
Gopinath [Tue, 12 Jul 2016 16:27:34 +0000 (16:27 +0000)]
Merge \"Merge \\"App launch - Test app changes\\" into nyc-dev am:
8fabbb89c0\" into nyc-mr1-dev
am:
3998b7a54b
Change-Id: I12f4663266153c0ed1c8fcf14104182158f494f5
Bill Yi [Tue, 12 Jul 2016 16:27:27 +0000 (16:27 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
fd3dc6d96d -s ours
Change-Id: I93a17573d5be751e02698e8731fd383b67db11a3
Bill Yi [Tue, 12 Jul 2016 16:27:20 +0000 (16:27 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
a2e1bb8c3e -s ours
Change-Id: I9cc0d048ec0185cdb7e4a69f6d75640fc22390ab
Bill Yi [Tue, 12 Jul 2016 16:27:16 +0000 (16:27 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
84c67fa304 -s ours
Change-Id: Iab40dd880d5a6c97614b4958747e4e7d2010c6ed
Joe Fernandez [Tue, 12 Jul 2016 16:27:12 +0000 (16:27 +0000)]
Merge \"docs: July 2016 Dashboard update\" into nyc-dev
am:
ba64d0ec2e
Change-Id: I23be5d435997ae2097dd7978f8a151b2d6074f97
Gopinath Elanchezhian [Tue, 12 Jul 2016 16:27:09 +0000 (16:27 +0000)]
Merge \\"App launch - Test app changes\\" into nyc-dev am:
8fabbb89c0
am:
2b6700a27b
Change-Id: Idb5094bfaab92982890c13dc9639ab45480acad6
TreeHugger Robot [Tue, 12 Jul 2016 16:19:06 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 16:11:59 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 12 Jul 2016 16:11:41 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 12 Jul 2016 16:11:24 +0000 (16:11 +0000)]
Merge "Merge \"App launch - Test app changes\" into nyc-dev am:
8fabbb89c0" into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 16:11:11 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Gopinath [Tue, 12 Jul 2016 16:11:01 +0000 (16:11 +0000)]
Merge \"App launch - Test app changes\" into nyc-dev
am:
8fabbb89c0
Change-Id: I0b14fe4a4dd9414d9fe9d15980e8058a7b3d9e29
TreeHugger Robot [Tue, 12 Jul 2016 16:10:11 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Joe Fernandez [Tue, 12 Jul 2016 16:09:53 +0000 (16:09 +0000)]
Merge "docs: July 2016 Dashboard update" into nyc-dev
Gopinath [Tue, 12 Jul 2016 16:09:18 +0000 (16:09 +0000)]
Merge \"App launch - Test app changes\" into nyc-dev
am:
8fabbb89c0
Change-Id: I304e8791b2ea72bd527fa0c8abd2c748c90e866c
Joe Fernandez [Tue, 12 Jul 2016 16:06:29 +0000 (09:06 -0700)]
docs: July 2016 Dashboard update
Change-Id: Ia2c6488340e7d17696ffe67ba120cb30bea94717
Gopinath Elanchezhian [Tue, 12 Jul 2016 16:02:42 +0000 (16:02 +0000)]
Merge "App launch - Test app changes" into nyc-dev
Chris Wren [Tue, 12 Jul 2016 15:24:17 +0000 (15:24 +0000)]
Merge \"also log details for neko rename events\" into nyc-mr1-dev
am:
53f0694f9a
Change-Id: I9c0aab9e3ee0589463f76dba50309501c4963bb7
Chris Wren [Tue, 12 Jul 2016 15:16:03 +0000 (15:16 +0000)]
Merge "also log details for neko rename events" into nyc-mr1-dev
Rubin Xu [Tue, 12 Jul 2016 15:05:59 +0000 (16:05 +0100)]
Guard against null object in scheduleNotifyUpdateAppWidgetLocked
Bug:
30085290
Change-Id: I4f12e1def98dff7e50b4d25a7d23e81bdbe0b7bd
Hugo Benichi [Tue, 12 Jul 2016 13:26:15 +0000 (13:26 +0000)]
Merge \\\"Fix unsafe concurrent access in LegacyTypeTracker\\\" am:
ee4c8fb9eb am:
e82b43f77e
am:
4057d3c24e
Change-Id: I4986b4646220b9be53f8063f2d5a41a763011a96
OSDN Git Service
