OSDN Git Service
Android Build Merger (Role) [Fri, 27 May 2016 03:43:03 +0000 (03:43 +0000)]
Merge "add redirect for Espresso Test Recorder doc that will soon be on TAC site. am:
8f60544180 am:
e1bd7e15c5 am:
5d3ca78d3f am:
0a659f8480" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:42:55 +0000 (03:42 +0000)]
Merge changes from topic 'am-
07760a7359434d758da865299f519df1' into nyc-mr1-dev-plus-aosp
* changes:
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff am:
bb27626141 am:
6c35cf2434 am:
42a5983364 am:
75095e6f02 am:
7c625e1938 am:
54a62d5feb am:
a5a2c88fb3 am:
7ff57eaff9 am:
94c8855da6 am:
50615e498e am:
aa98ab568c
DO NOT MERGE : backport of backup transport whitelist am:
647cb6a6d8 -s ours am:
077534b101 am:
4c559cdade am:
24ceca96af -s ours am:
88c9eae886 am:
1fa817c057 am:
040cf14047 am:
0905c8f398 -s ours am:
d39c0a8d77 am:
d8e548f6ea
smain@google.com [Fri, 27 May 2016 03:39:11 +0000 (03:39 +0000)]
add redirect for Espresso Test Recorder doc that will soon be on TAC site. am:
8f60544180 am:
e1bd7e15c5 am:
5d3ca78d3f
am:
0a659f8480
* commit '
0a659f8480657f736b7e5c79f6d630e57140ed9e':
Change-Id: Ib0cef6d68f8d5002a0223a991ed2b30991717020
Paul Jensen [Fri, 27 May 2016 03:38:29 +0000 (03:38 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff am:
bb27626141 am:
6c35cf2434 am:
42a5983364 am:
75095e6f02 am:
7c625e1938 am:
54a62d5feb am:
a5a2c88fb3 am:
7ff57eaff9 am:
94c8855da6 am:
50615e498e
am:
aa98ab568c
* commit '
aa98ab568cc3f7cba554b5bdb7fcd70a9b05ae61':
Change-Id: I2f311ce3ddb510f73c3d9e8d08991c8d5bd99a90
Android Build Merger (Role) [Fri, 27 May 2016 03:32:02 +0000 (03:32 +0000)]
Merge "Merge "Fix Activity Transition mess-up." into nyc-dev am:
bd34103c5d am:
ff0298540b" into nyc-mr1-dev-plus-aosp
Christopher Tate [Fri, 27 May 2016 03:32:02 +0000 (03:32 +0000)]
DO NOT MERGE : backport of backup transport whitelist am:
647cb6a6d8 -s ours am:
077534b101 am:
4c559cdade am:
24ceca96af -s ours am:
88c9eae886 am:
1fa817c057 am:
040cf14047 am:
0905c8f398 -s ours am:
d39c0a8d77
am:
d8e548f6ea
* commit '
d8e548f6ea5e185bd0f9e22acef9355f5307245d':
Change-Id: I25c53c4fe1a0ece0d9c20e339f26a81f5cf62d78
George Mount [Fri, 27 May 2016 03:31:31 +0000 (03:31 +0000)]
Merge "Fix Activity Transition mess-up." into nyc-dev am:
bd34103c5d
am:
ff0298540b
* commit '
ff0298540bf737853b10859b74f3b5d979b2fe23':
Fix toast with accessibility and app pinning
Change-Id: I05698e4b8883f31d92f627d55ae938b29e4a5818
Android Build Merger (Role) [Fri, 27 May 2016 03:30:47 +0000 (03:30 +0000)]
Merge "Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am:
793ac34219 am:
8453136b8e" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:30:38 +0000 (03:30 +0000)]
Merge "Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev am:
0f1ae5fa0f am:
4e6cd80198" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:30:26 +0000 (03:30 +0000)]
Merge "Merge "Fixing crash in SysUI due to invalid group." into nyc-dev am:
814358a24f am:
d93090d916" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:30:16 +0000 (03:30 +0000)]
Merge "Merge "Merge "Time to #NameAndroidN!" into nyc-dev am:
45caebe035" into nyc-mr1-dev am:
a474cf8a90" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:30:07 +0000 (03:30 +0000)]
Merge "Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am:
d6ee899397" into nyc-mr1-dev am:
56f7a36c46" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:29:35 +0000 (03:29 +0000)]
Merge "Merge "Update the light center when the root view\'s layout changed" into nyc-dev am:
e78ba24c17 am:
b076ee0a42" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:29:25 +0000 (03:29 +0000)]
Merge "Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev am:
d34d06606d am:
4eccbbf926" into nyc-mr1-dev-plus-aosp
Wyatt Riley [Fri, 27 May 2016 03:29:22 +0000 (03:29 +0000)]
Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am:
793ac34219
am:
8453136b8e
* commit '
8453136b8ee7ba361d4180df75328466292c9610':
Fix Activity Transition mess-up.
Change-Id: I3904d1d8782c07f0a869243802c1e1dc8d6e49b1
Android Build Merger (Role) [Fri, 27 May 2016 03:29:15 +0000 (03:29 +0000)]
Merge "Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev am:
1ad12e0678 am:
5ce70998d0" into nyc-mr1-dev-plus-aosp
Alan Viverette [Fri, 27 May 2016 03:29:12 +0000 (03:29 +0000)]
Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev am:
0f1ae5fa0f
am:
4e6cd80198
* commit '
4e6cd801989e5de1f13d3db1050cbd48ee5be4f2':
Prevent use of a null sCallbackObj by Hardware FLP
Change-Id: I88059295c45e5ef9091fa5a2a6b8ca7a0640f004
Android Build Merger (Role) [Fri, 27 May 2016 03:29:08 +0000 (03:29 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am:
9aed8c2fa0 -s ours am:
9f2ffbcd66 -s ours" into nyc-mr1-dev-plus-aosp
Winson Chung [Fri, 27 May 2016 03:29:03 +0000 (03:29 +0000)]
Merge "Fixing crash in SysUI due to invalid group." into nyc-dev am:
814358a24f
am:
d93090d916
* commit '
d93090d916b5c526777a57717c99800999bdf850':
Prevent callbacks during DrawableContainer child initialization
Change-Id: I54f2a3b4efc1073420dd84acff1c278c46161841
Android Build Merger (Role) [Fri, 27 May 2016 03:28:58 +0000 (03:28 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am:
cb8c569414 -s ours am:
8272bb6af4 -s ours" into nyc-mr1-dev-plus-aosp
Dan Sandler [Fri, 27 May 2016 03:28:57 +0000 (03:28 +0000)]
Merge "Merge "Time to #NameAndroidN!" into nyc-dev am:
45caebe035" into nyc-mr1-dev
am:
a474cf8a90
* commit '
a474cf8a902b111aba52318fe16d258aefae13fe':
Fixing crash in SysUI due to invalid group.
Change-Id: Id5c87e72274a5083c2cf8625ee366ed46dd9859f
Jeff Sharkey [Fri, 27 May 2016 03:28:50 +0000 (03:28 +0000)]
Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am:
d6ee899397" into nyc-mr1-dev
am:
56f7a36c46
* commit '
56f7a36c46678f596f870fbef41252eedc812150':
Time to #NameAndroidN!
Change-Id: Iec0ae063378200965d8a153308afac4edcfc9a8d
Tenghui Zhu [Fri, 27 May 2016 03:28:23 +0000 (03:28 +0000)]
Merge "Update the light center when the root view\'s layout changed" into nyc-dev am:
e78ba24c17
am:
b076ee0a42
* commit '
b076ee0a4290bc12c7eb1f959551c62448d74a81':
Change-Id: I871f9e75d10775e7851e81ac55b45e227f1858fa
Phil Burk [Fri, 27 May 2016 03:27:33 +0000 (03:27 +0000)]
Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev am:
d34d06606d
am:
4eccbbf926
* commit '
4eccbbf9265a1134d870ff65ea9f7f798329bfd0':
Change-Id: Ic9a7c0b7b411ca19f09aaf2a9fa183acec5f0786
Manoja Wijewardene [Fri, 27 May 2016 03:25:24 +0000 (03:25 +0000)]
Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev am:
1ad12e0678
am:
5ce70998d0
* commit '
5ce70998d014bdf3a819d3b0512925bebf9afb2c':
Change-Id: I5bd1b0ce031a34249274746e4b584c2becfde313
Bill Yi [Fri, 27 May 2016 03:24:34 +0000 (03:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
9aed8c2fa0 -s ours
am:
9f2ffbcd66 -s ours
* commit '
9f2ffbcd6674928818775002f15a1661d322aef1':
Change-Id: Idaf84d41a7aac1ed04b0abf97ca0449b53afaf89
Jorim Jaggi [Fri, 27 May 2016 03:24:20 +0000 (03:24 +0000)]
Fix toast with accessibility and app pinning
am:
cf984c56ad
* commit '
cf984c56adf88ab9d85b9a6ca71d800c2a937e6c':
Fix toast with accessibility and app pinning
Change-Id: I0c1ed9d86d6f372227a12b8f5de7f4ab0b9fd37a
Jeff Sharkey [Fri, 27 May 2016 03:24:09 +0000 (03:24 +0000)]
Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am:
d6ee899397" into nyc-mr1-dev
am:
4e8b6bfe69
* commit '
4e8b6bfe69c8dcd8706743f04f412848b9e2e345':
Delay PACKAGE_RESTARTED until after data cleared.
Change-Id: I9624930d2a00c3dac197c67d613fa7d578826035
George Mount [Fri, 27 May 2016 03:24:06 +0000 (03:24 +0000)]
Merge "Fix Activity Transition mess-up." into nyc-dev
am:
bd34103c5d
* commit '
bd34103c5defbfd180be6a387eb5aa82d4b97eac':
Fix Activity Transition mess-up.
Change-Id: I62457d504583e1865ceeace2918d81b4ef223b12
Jeff Sharkey [Fri, 27 May 2016 03:24:03 +0000 (03:24 +0000)]
Merge "Merge "Careful process validation for unaware providers." into nyc-dev am:
678dba737b" into nyc-mr1-dev
am:
37b78dcdd7
* commit '
37b78dcdd7790b758f9031976c7ca615de383c69':
Careful process validation for unaware providers.
Change-Id: Ibe3cafb6a31be30df823870e3f39dd1e31dfa75a
Winson [Fri, 27 May 2016 03:23:55 +0000 (03:23 +0000)]
Merge "Defer calling the stack task removed callbacks. am:
6c8217ab30" into nyc-mr1-dev
am:
e351f281ef
* commit '
e351f281efcf9fe30d3a39f2b471f68f2ac2a273':
Defer calling the stack task removed callbacks.
Change-Id: I1addad7ea298ad0257a5df0a4304850543ee63d1
Wyatt Riley [Fri, 27 May 2016 03:23:44 +0000 (03:23 +0000)]
Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev
am:
793ac34219
* commit '
793ac342196c57f6b89ad9d1425fc420fbb44bb5':
Prevent use of a null sCallbackObj by Hardware FLP
Change-Id: I3681a3433f21112659840fb4431f0f616305ee3c
Jeff Sharkey [Fri, 27 May 2016 03:23:40 +0000 (03:23 +0000)]
Merge changes from topic \'am-
e4ceb878ab564c70a4e1726ee7c0709a\' into nyc-mr1-dev
am:
0ce1648f01
* commit '
0ce1648f016e96cd7a496753b86d16f78795930a':
Suppress unlock notifications on non-FBE devices.
Replace caribou wallpaper without the stars b/
28339724
Change-Id: I05bc48ae343e57be43e88dafc538a3dfe77ff37a
Bill Yi [Fri, 27 May 2016 03:23:14 +0000 (03:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
cb8c569414 -s ours
am:
8272bb6af4 -s ours
* commit '
8272bb6af49a6ce8803e54c92fe63a095bb23a24':
Change-Id: I676d3e4ac37db3b933d775e6b886c9cc5a38c8d2
Eric Schmidt [Fri, 27 May 2016 03:23:08 +0000 (03:23 +0000)]
Merge "Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am:
8e08dbe8f8 am:
400aed3556 am:
28bdf2907a" into nyc-mr1-dev
am:
b5cb2ff00a
* commit '
b5cb2ff00a119870875b8f0aa2e9fd0fa49f1890':
docs: Removing CLI steps in getting started docs
Change-Id: I82373e48cac77b840c4330b37aeb10bda0da860d
Alan Viverette [Fri, 27 May 2016 03:22:53 +0000 (03:22 +0000)]
Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev
am:
0f1ae5fa0f
* commit '
0f1ae5fa0f405bc3ec040fe512f7fad86577ce9f':
Prevent callbacks during DrawableContainer child initialization
Change-Id: Ica1a228184231c5d33564968605e0a0e21a1dd0b
Winson [Fri, 27 May 2016 03:22:01 +0000 (03:22 +0000)]
Merge "Fixing crash in SysUI due to invalid group." into nyc-dev
am:
814358a24f
* commit '
814358a24f7bf045cdd8261f15aefff59936287b':
Fixing crash in SysUI due to invalid group.
Change-Id: Ib194b1041b5931483857ee57c0573277e942ec31
Christine Hallstrom [Fri, 27 May 2016 03:16:59 +0000 (03:16 +0000)]
Merge "Properly check if BT is off when shutting down radios" into nyc-mr1-dev
am:
0f760e0815
* commit '
0f760e081570cb7fe3ac7dd6a86125a8f79e5b34':
Properly check if BT is off when shutting down radios
Change-Id: I7d3b2d40664115555db897b46b3debc5b2c04f8d
Julia Reynolds [Fri, 27 May 2016 03:16:55 +0000 (03:16 +0000)]
Merge "Unlocked access of mServices is bad." into nyc-dev am:
d9599faf6b
am:
c2813e2501
* commit '
c2813e2501b9807e3e497b73ce0de11d7c502ef5':
Unlocked access of mServices is bad.
Change-Id: Ida62aad8608081cc74b9a1ab6b7a125af637ea65
Julia Reynolds [Fri, 27 May 2016 03:14:51 +0000 (03:14 +0000)]
Merge "Reset slider animator on density change" into nyc-dev am:
d52a81eeae
am:
0e64814c7d
* commit '
0e64814c7d954083d93102a645a9b44239a50408':
Reset slider animator on density change
Change-Id: I8d59a243c67a35133430cb378d76413ce6d176c1
Fyodor Kupolov [Fri, 27 May 2016 03:14:39 +0000 (03:14 +0000)]
Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev am:
a4dbdaf5e9
am:
5d531e4f6c
* commit '
5d531e4f6caedbcc2b6a9c7a549b83e37d694c7d':
Remove ActivityManager calls with PM.mInstallLock held
Change-Id: I17c8e62b0c65afe3fe58490d8e5634d9442e6821
smain@google.com [Fri, 27 May 2016 03:14:30 +0000 (03:14 +0000)]
add redirect for Espresso Test Recorder doc that will soon be on TAC site. am:
8f60544180 am:
e1bd7e15c5 am:
5d3ca78d3f
am:
b35e6f9ad7
* commit '
b35e6f9ad7ddfc88bb9897746447f685304edb99':
add redirect for Espresso Test Recorder doc that will soon be on TAC site.
Change-Id: I460a9ee98f98c13f054f63b40ab39bf7d9422988
Paul Jensen [Fri, 27 May 2016 03:14:22 +0000 (03:14 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff am:
bb27626141 am:
6c35cf2434 am:
42a5983364 am:
75095e6f02 am:
7c625e1938 am:
54a62d5feb am:
a5a2c88fb3 am:
7ff57eaff9 am:
94c8855da6 am:
50615e498e
am:
fdc53e96d3
* commit '
fdc53e96d3e99f4b5b5a9406e1c59b5e32bfc96c':
Don't pass URL path and username/password to PAC scripts
Change-Id: I75e1b139492cac12bf73fa68894f2e7ae7deb701
Android Build Merger (Role) [Fri, 27 May 2016 03:14:18 +0000 (03:14 +0000)]
Merge "Merge "Time to #NameAndroidN!" into nyc-dev am:
45caebe035" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 27 May 2016 03:14:09 +0000 (03:14 +0000)]
Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am:
d6ee899397" into nyc-mr1-dev
Christopher Tate [Fri, 27 May 2016 03:14:07 +0000 (03:14 +0000)]
DO NOT MERGE : backport of backup transport whitelist am:
647cb6a6d8 -s ours am:
077534b101 am:
4c559cdade am:
24ceca96af -s ours am:
88c9eae886 am:
1fa817c057 am:
040cf14047 am:
0905c8f398 -s ours am:
d39c0a8d77
am:
50aa0324c9
* commit '
50aa0324c9f425b83b4ca241fb8727033f026532':
DO NOT MERGE : backport of backup transport whitelist
Change-Id: I380d5828e9b8b8860d59d2ea9077b368f1c82d55
Android Build Merger (Role) [Fri, 27 May 2016 03:14:02 +0000 (03:14 +0000)]
Merge "Merge "Careful process validation for unaware providers." into nyc-dev am:
678dba737b" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 27 May 2016 03:13:54 +0000 (03:13 +0000)]
Merge "Defer calling the stack task removed callbacks. am:
6c8217ab30" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 27 May 2016 03:13:44 +0000 (03:13 +0000)]
Merge changes from topic 'am-
e4ceb878ab564c70a4e1726ee7c0709a' into nyc-mr1-dev
* changes:
Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev am:
a39d888651
Merge "Replace caribou wallpaper without the stars b/
28339724" into nyc-dev am:
b3d4ad2205
Android Build Merger (Role) [Fri, 27 May 2016 03:13:31 +0000 (03:13 +0000)]
Merge "Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am:
8e08dbe8f8 am:
400aed3556 am:
28bdf2907a" into nyc-mr1-dev
Dan Sandler [Fri, 27 May 2016 03:12:50 +0000 (03:12 +0000)]
Merge "Time to #NameAndroidN!" into nyc-dev
am:
45caebe035
* commit '
45caebe035a67db18d06c4f4e4f124246fb5321d':
Time to #NameAndroidN!
Change-Id: Iecedefbae64d4a6ffb67971be0f9da5eb746b1ed
Jeff Sharkey [Fri, 27 May 2016 03:12:31 +0000 (03:12 +0000)]
Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev
am:
d6ee899397
* commit '
d6ee8993973050befff3a5f10f273ef9e8a050e2':
Delay PACKAGE_RESTARTED until after data cleared.
Change-Id: I8bb3f31a6de42da81a44c9aaf121769ed96b6a3b
Jeff Sharkey [Fri, 27 May 2016 03:12:15 +0000 (03:12 +0000)]
Merge "Careful process validation for unaware providers." into nyc-dev
am:
678dba737b
* commit '
678dba737bed94eb5eeeed63db74aa811ee896cb':
Careful process validation for unaware providers.
Change-Id: I7856be9d44587869ee73533072aaf26d8a7908ab
Winson [Fri, 27 May 2016 03:11:47 +0000 (03:11 +0000)]
Defer calling the stack task removed callbacks.
am:
6c8217ab30
* commit '
6c8217ab3072fa65851316a922b482506b3c2a4c':
Defer calling the stack task removed callbacks.
Change-Id: Icf53cc0628c98293b3a2d4ab28d95e54ee93f248
Jeff Sharkey [Fri, 27 May 2016 03:11:06 +0000 (03:11 +0000)]
Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev
am:
a39d888651
* commit '
a39d888651493d20f3814cd88a39a521450b3eac':
Suppress unlock notifications on non-FBE devices.
Change-Id: I9e17a23b0f3127ac5ae0f08cbf0a6c306aaba9d5
Hyunyoung Song [Fri, 27 May 2016 03:08:58 +0000 (03:08 +0000)]
Merge "Replace caribou wallpaper without the stars b/
28339724" into nyc-dev
am:
b3d4ad2205
* commit '
b3d4ad220598beffb30ac4cd44741ff19da2c57a':
Replace caribou wallpaper without the stars b/
28339724
Change-Id: I8062526bf7ba313e924621cf6a16ceb738e72d72
TreeHugger Robot [Fri, 27 May 2016 03:08:37 +0000 (03:08 +0000)]
Merge "Properly check if BT is off when shutting down radios" into nyc-mr1-dev
Eric Schmidt [Fri, 27 May 2016 03:08:38 +0000 (03:08 +0000)]
Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am:
8e08dbe8f8 am:
400aed3556
am:
28bdf2907a
* commit '
28bdf2907aa5448f455475fde399870c22c4180a':
docs: Removing CLI steps in getting started docs
Change-Id: Iaf0135b79c79cb299055096091bc1519527ab1b7
Julia Reynolds [Fri, 27 May 2016 03:06:10 +0000 (03:06 +0000)]
Merge "Unlocked access of mServices is bad." into nyc-dev
am:
d9599faf6b
* commit '
d9599faf6b872fb5e1db72f7239b21d05050bd47':
Unlocked access of mServices is bad.
Change-Id: I84a2e07aa57e5e25ac1190b4dbfa4005c6d1e572
Julia Reynolds [Fri, 27 May 2016 03:05:42 +0000 (03:05 +0000)]
Merge "Reset slider animator on density change" into nyc-dev
am:
d52a81eeae
* commit '
d52a81eeae2b9b8425a75ee8906ed7b94b5c471a':
Reset slider animator on density change
Change-Id: I75012bd5af8ae07e5917fbffbc18cf1120e09ebc
Fyodor Kupolov [Fri, 27 May 2016 03:05:20 +0000 (03:05 +0000)]
Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev
am:
a4dbdaf5e9
* commit '
a4dbdaf5e96273dccd474e31700d84a1ad907503':
Remove ActivityManager calls with PM.mInstallLock held
Change-Id: I3be800fc5de9fa3c06f0bf6158a0dbf2a05b165e
smain@google.com [Fri, 27 May 2016 03:05:00 +0000 (03:05 +0000)]
add redirect for Espresso Test Recorder doc that will soon be on TAC site. am:
8f60544180 am:
e1bd7e15c5
am:
5d3ca78d3f
* commit '
5d3ca78d3f561e98ae67cf97caa58a4e9e2ed5cd':
add redirect for Espresso Test Recorder doc that will soon be on TAC site.
Change-Id: I339dffae3b9532699c558d406b03a32dabae6517
Paul Jensen [Fri, 27 May 2016 03:04:34 +0000 (03:04 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff am:
bb27626141 am:
6c35cf2434 am:
42a5983364 am:
75095e6f02 am:
7c625e1938 am:
54a62d5feb am:
a5a2c88fb3 am:
7ff57eaff9 am:
94c8855da6
am:
50615e498e
* commit '
50615e498e11f356ef582af0f9616945d04faa80':
Don't pass URL path and username/password to PAC scripts
Change-Id: I2197af29029456780438123c59214c3d8c58a6ef
Android Build Merger (Role) [Fri, 27 May 2016 03:03:46 +0000 (03:03 +0000)]
Merge "Merge "Importance slider updates." into nyc-dev am:
2bf73e94c3 am:
901bdeadef" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:03:41 +0000 (03:03 +0000)]
Merge "Merge "Update the light center when the root view\'s layout changed" into nyc-dev am:
e78ba24c17 am:
56d4dae9ec" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:03:36 +0000 (03:03 +0000)]
Merge "Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am:
36cbf5ca37 am:
6843da1aa8" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:03:30 +0000 (03:03 +0000)]
Merge "Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev am:
d34d06606d am:
29e8879307" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:03:22 +0000 (03:03 +0000)]
Merge "Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev am:
72f19ff6f0 am:
b59383a375" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:03:14 +0000 (03:03 +0000)]
Merge "Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev am:
1ad12e0678 am:
d667ff5930" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:03:09 +0000 (03:03 +0000)]
Merge "Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev am:
33154deb70 am:
174385a208" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:03:01 +0000 (03:03 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am:
9aed8c2fa0 -s ours am:
02befc3229 -s ours" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:02:59 +0000 (03:02 +0000)]
Merge "Merge "add metrics for notification and group expansion" into nyc-dev am:
0f97b8fcbd am:
32b50d9c39" into nyc-mr1-dev-plus-aosp
Tenghui Zhu [Fri, 27 May 2016 03:02:14 +0000 (03:02 +0000)]
Merge "Update the light center when the root view\'s layout changed" into nyc-dev am:
e78ba24c17
am:
56d4dae9ec
* commit '
56d4dae9ec7503660bdd762e2e04f267d7f2704c':
Update the light center when the root view's layout changed
Change-Id: Ifedcb88adb38eb23ad82b7836c5de5f738c80c10
Phil Burk [Fri, 27 May 2016 03:02:09 +0000 (03:02 +0000)]
Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev am:
d34d06606d
am:
29e8879307
* commit '
29e8879307bc0a73f34b12074944c788821a4373':
AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY
Change-Id: Id74f4c4831fd070cfdfb1228c9813635bd18ccbc
Manoja Wijewardene [Fri, 27 May 2016 03:02:03 +0000 (03:02 +0000)]
Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev am:
1ad12e0678
am:
d667ff5930
* commit '
d667ff5930240fbb3aab057a9da2a9d173f6b94c':
Elaborate on requirement to support PreRebootSecurityLogs
Change-Id: Ib6ca093eb4041ff298a31eea5da5bebac6db491c
Bill Yi [Fri, 27 May 2016 03:01:58 +0000 (03:01 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
9aed8c2fa0 -s ours
am:
02befc3229 -s ours
* commit '
02befc32293351a93a1ba073ff884e6135c0c121':
Import translations. DO NOT MERGE
Change-Id: If60580203a307385c138d41f41790e8ca3852120
Julia Reynolds [Fri, 27 May 2016 03:01:53 +0000 (03:01 +0000)]
Merge "Importance slider updates." into nyc-dev am:
2bf73e94c3
am:
901bdeadef
* commit '
901bdeadef9c293c093e7902b414734b9c63ac2c':
Importance slider updates.
Change-Id: I2a33854c4fc17435684e159033f3860d3f46a70f
Jeff Sharkey [Fri, 27 May 2016 03:00:53 +0000 (03:00 +0000)]
Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am:
36cbf5ca37
am:
6843da1aa8
* commit '
6843da1aa8da6374dde23ef20bad2abfed6aaba2':
Cache IMountService for isUserKeyUnlocked() calls.
Change-Id: Ie9aff29f7488bd78d13c6915874a3d1ef53e6715
Bill Yi [Fri, 27 May 2016 03:00:13 +0000 (03:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
cb8c569414 -s ours
am:
977d5bbfd2 -s ours
* commit '
977d5bbfd2f67d18978ab55fbf26cbcfc282283e':
Import translations. DO NOT MERGE
Change-Id: I85443596959d0cfd85225f2aa3c336eab2c042e4
Julia Reynolds [Fri, 27 May 2016 02:59:17 +0000 (02:59 +0000)]
Merge "Importance slider updates." into nyc-dev am:
2bf73e94c3
am:
19a8d034fb
* commit '
19a8d034fbdfb1a6d0ec4b9b808d82f30cbb834f':
Importance slider updates.
Change-Id: I257ec5f912b9036ec5f18ba249951dd80ad6bc4b
Jeff Sharkey [Fri, 27 May 2016 02:58:50 +0000 (02:58 +0000)]
Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am:
36cbf5ca37
am:
bda14dd987
* commit '
bda14dd987498d4c75dcbbe7b4bba73db165c1c8':
Cache IMountService for isUserKeyUnlocked() calls.
Change-Id: Ic5577c55324a52e761919febc0cab9af0e18e919
Jason Monk [Fri, 27 May 2016 02:58:33 +0000 (02:58 +0000)]
Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev am:
72f19ff6f0
am:
b59383a375
* commit '
b59383a375c41936ac5e2865383ef49b267e7b10':
QS: Make hotspot go unavailable in airplane mode
Change-Id: I5d250ddd412327f9065111b3becb4f2e77a55a73
Jason Monk [Fri, 27 May 2016 02:58:33 +0000 (02:58 +0000)]
Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev am:
72f19ff6f0
am:
628c714f3e
* commit '
628c714f3e3414155f4e477bfa8d76b520ced01b':
QS: Make hotspot go unavailable in airplane mode
Change-Id: I1db7a4e27b0e518509ac0e51e44c2f3fd781b38b
Christopher Tate [Fri, 27 May 2016 02:58:27 +0000 (02:58 +0000)]
DO NOT MERGE : backport of backup transport whitelist am:
647cb6a6d8 -s ours am:
077534b101 am:
4c559cdade am:
24ceca96af -s ours am:
88c9eae886 am:
1fa817c057 am:
040cf14047 am:
0905c8f398 -s ours
am:
d39c0a8d77
* commit '
d39c0a8d775988bfbf319777b2a17af1579b531a':
DO NOT MERGE : backport of backup transport whitelist
Change-Id: Icd0546a4c3d1e01b356958b78ba143e44061515e
Robin Lee [Fri, 27 May 2016 02:58:19 +0000 (02:58 +0000)]
Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev am:
33154deb70
am:
6c3cb2c392
* commit '
6c3cb2c3926182245a0e80a7e3c95ff04d032b06':
Check if we're connected before marking a UID blocked
Change-Id: Ib2b6ddd0d5a6e7a4b825a3113d275d753c5c08b0
Robin Lee [Fri, 27 May 2016 02:57:33 +0000 (02:57 +0000)]
Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev am:
33154deb70
am:
174385a208
* commit '
174385a2084439678bea758733edd893b255d22a':
Check if we're connected before marking a UID blocked
Change-Id: I31b69b3e7bb307c80c472941f57e480888918a34
Chris Wren [Fri, 27 May 2016 02:56:24 +0000 (02:56 +0000)]
Merge "add metrics for notification and group expansion" into nyc-dev am:
0f97b8fcbd
am:
32b50d9c39
* commit '
32b50d9c39f8ffd740d8e95549004559bed2f954':
Change-Id: I545c3ce7b10858d88866b17c800f7e6d82d7fae1
Teng-Hui Zhu [Fri, 27 May 2016 02:50:14 +0000 (02:50 +0000)]
Merge "Update the light center when the root view\'s layout changed" into nyc-dev
am:
e78ba24c17
* commit '
e78ba24c176fd6a0c54eaf7e52be545952ba1ab7':
Update the light center when the root view's layout changed
Change-Id: Ic973b9b47df6550c5170c2248c7e0f2ab25c6a57
Phil Burk [Fri, 27 May 2016 02:49:44 +0000 (02:49 +0000)]
Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev
am:
d34d06606d
* commit '
d34d06606dd5be9fc18029e87cb4b56ecef21864':
AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY
Change-Id: I3c7741fcf914f4e2f6cf89eaec2d72ba519a24b1
Rubin Xu [Fri, 27 May 2016 02:48:59 +0000 (02:48 +0000)]
Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev
am:
1ad12e0678
* commit '
1ad12e0678e87e2ed64dcbc878ee2c7136b5ccdb':
Elaborate on requirement to support PreRebootSecurityLogs
Change-Id: I088c0a0980517d3b4ffa6fe1b1aa9add7620c6e0
Bill Yi [Fri, 27 May 2016 02:47:12 +0000 (02:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
9aed8c2fa0 -s ours
* commit '
9aed8c2fa01785be20cd7cc07976670812bc84a0':
Import translations. DO NOT MERGE
Change-Id: I0305b137eed7ecf9e4b149a0f589e658de16811f
Bill Yi [Fri, 27 May 2016 02:46:32 +0000 (02:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
cb8c569414 -s ours
* commit '
cb8c569414121158adb2a627d4a91b47dd3c4362':
Import translations. DO NOT MERGE
Change-Id: I6ed4074aea21921c930baa71f5564b7dd847618e
Julia Reynolds [Fri, 27 May 2016 02:43:28 +0000 (02:43 +0000)]
Merge "Importance slider updates." into nyc-dev
am:
2bf73e94c3
* commit '
2bf73e94c389bf9457df132d6eaf294f9d35587f':
Importance slider updates.
Change-Id: Ia9d063f6422259f80aeee6fe2d27ca1354538955
Jeff Sharkey [Fri, 27 May 2016 02:42:44 +0000 (02:42 +0000)]
Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev
am:
36cbf5ca37
* commit '
36cbf5ca378523bfa4f5394e39f5fcff2b2461de':
Cache IMountService for isUserKeyUnlocked() calls.
Change-Id: I1ad2d1eba64a89e7a22dc86c7241f6f85a5f2a0b
Jason Monk [Fri, 27 May 2016 02:42:04 +0000 (02:42 +0000)]
Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev
am:
72f19ff6f0
* commit '
72f19ff6f057fff184c875194e802005f8e8fd08':
QS: Make hotspot go unavailable in airplane mode
Change-Id: Ia21b21a840106fcbd7ca534ee639f43c0487a396
Robin Lee [Fri, 27 May 2016 02:39:45 +0000 (02:39 +0000)]
Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev
am:
33154deb70
* commit '
33154deb700a8cf5df6fff39f0b3291d1278efa0':
Check if we're connected before marking a UID blocked
Change-Id: I7a2552f43c66b1b1adb094d3b91ef87648e57bde
Chris Wren [Fri, 27 May 2016 02:39:20 +0000 (02:39 +0000)]
resolve merge conflicts of
0f97b8f to nyc-mr1-dev
am:
5b3b72e7b7
* commit '
5b3b72e7b7a926ac954db23c2ceaf10aa9b32539':
add metrics for notification and group expansion
Change-Id: I2df2f6e2ba27e4368162ce0642c77ec0a559620e
Chris Wren [Fri, 27 May 2016 02:28:03 +0000 (22:28 -0400)]
resolve merge conflicts of
0f97b8f to nyc-mr1-dev
Change-Id: I5e03144e3ae95777eb651add098eabe8af6ad08e
Fyodor Kupolov [Fri, 27 May 2016 00:54:20 +0000 (00:54 +0000)]
Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev
am:
2c5cbd4012
* commit '
2c5cbd4012aef736c94a7afc84a778623c639d10':
Clean up demo dir when leaving demo mode
Change-Id: Ia7891f8e5106130d669a1daa7fcc691db1f5e4c7
Fyodor Kupolov [Fri, 27 May 2016 00:48:37 +0000 (00:48 +0000)]
Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev
OSDN Git Service
