Android Build Merger (Role)
|
d344b407df
|
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only am: edd8dc83d5 am: 4cb8e2de6f" into nyc-mr1-dev-plus-aosp
|
2016-10-13 19:14:08 +00:00 |
|
Christopher Tate
|
8371d28717
|
Retain allowBackup annotation when system+lock wallpaper becomes lock only am: edd8dc83d5
am: 4cb8e2de6f
Change-Id: Ic4309ab74a5e9ce4893e582541e84f5160bf9d2f
|
2016-10-13 19:13:33 +00:00 |
|
George French
|
ba297baa04
|
Docs: Developer written case studies batch 3 (proj 31) am: 26ab4135ab
am: 7fc349d57b
Change-Id: Iad31d60815af6eb6d4a3b0b4f31ed38632386292
|
2016-10-13 19:11:14 +00:00 |
|
Kevin Hufnagle
|
b64a060326
|
Merge "docs: Revised Espresso code snippets" into nyc-dev am: aa78ed5b0a
am: 6c6080c184
Change-Id: I49963b9f7415dfcb05132c5cb9d8fa4b2231b53f
|
2016-10-13 19:10:18 +00:00 |
|
Kevin Hufnagle
|
8aeef83962
|
docs: Revised Espresso code snippets am: d3c3c34134
am: 73b8852c9e
Change-Id: Ifee2334b45b5d387a4eccc3840260fadad4325ea
|
2016-10-13 19:08:31 +00:00 |
|
Greg Plesur
|
3514404984
|
DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should
return 'false' for Wear devices after pairing/upgrade.
BUG: 32019375
Change-Id: I2563efe58c98c5dd8440891e478c89e093d8d9ac
|
2016-10-13 15:08:14 -04:00 |
|
Kevin Hufnagle
|
c9aa1bd530
|
Merge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB." into nyc-dev am: 8e4ea67fa7
am: df40339d4b
Change-Id: I992165e933fa868d26078015a860c3b8efcc5594
|
2016-10-13 19:07:37 +00:00 |
|
Kevin Hufnagle
|
847db9ed1d
|
cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB. am: 197226e4a5
am: ccde6c9c5e
Change-Id: Ib4394208cc8ddbadb398ff16eca4df302e759b20
|
2016-10-13 19:06:39 +00:00 |
|
Bert McMeen
|
f871452817
|
Docs: Remove a reference to a deprecated sample am: 3e01ab2b0e
am: 33b31ee73a
Change-Id: Ib4506eeefc13b4e207e8806cbb30846a647f4b78
|
2016-10-13 19:05:49 +00:00 |
|
Chris Tate
|
622e97ffaf
|
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev
am: 4bd56fbbee
Change-Id: I19fae35338016bbbb7de07e8c9d978bab2e088fe
|
2016-10-13 19:04:43 +00:00 |
|
Christopher Tate
|
4cb8e2de6f
|
Retain allowBackup annotation when system+lock wallpaper becomes lock only
am: edd8dc83d5
Change-Id: I2f3a6587bb7f53517232cf051a345e2c617b3778
|
2016-10-13 19:04:40 +00:00 |
|
Tobias Sargeant
|
8959832d40
|
Merge "Refactor ZygoteInit to support a WebView-specific zygote." into stage-aosp-master am: 38bfbf8d2a
am: 6fd39c5cd5
Change-Id: Ie04786fe95b99a92a7dc0366e8847168372baa76
|
2016-10-13 19:04:39 +00:00 |
|
Robert Sesek
|
f43d5b36d6
|
Merge "resolve merge conflicts of 7031dac to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
|
2016-10-13 18:55:37 +00:00 |
|
Chris Tate
|
4bd56fbbee
|
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev
|
2016-10-13 18:51:13 +00:00 |
|
Bert McMeen
|
4480f347f8
|
Docs: Updates to the Download/Test file related to watch setup am: 137c545e4e am: 58425dc58d am: 669537a9fe
am: 0a3270642c
Change-Id: I5954b87d81b8127cf8a071d51473481770d84061
|
2016-10-13 18:16:04 +00:00 |
|
Bert McMeen
|
0a3270642c
|
Docs: Updates to the Download/Test file related to watch setup am: 137c545e4e am: 58425dc58d
am: 669537a9fe
Change-Id: Ie8e8b14c46ccfda8824dccfdbf2dc3029661ad0b
|
2016-10-13 18:03:31 +00:00 |
|
Bert McMeen
|
669537a9fe
|
Docs: Updates to the Download/Test file related to watch setup am: 137c545e4e
am: 58425dc58d
Change-Id: Icf36fd2b6c4b2489a7197d32392c4a6382a934c3
|
2016-10-13 17:50:57 +00:00 |
|
Bert McMeen
|
4c5141b98b
|
Docs: Updates to the Download/Test file related to watch setup
am: 137c545e4e
Change-Id: I91ed5e485e29bbed111acab07ef42d7cfc33dfe7
|
2016-10-13 17:39:07 +00:00 |
|
Bert McMeen
|
58425dc58d
|
Docs: Updates to the Download/Test file related to watch setup
am: 137c545e4e
Change-Id: Ic605d9d26c60e3dd01cd4a9993a6d50d5cfdd94c
|
2016-10-13 17:38:59 +00:00 |
|
Yuta Yamada
|
be3b53beca
|
Merge "Fix memory leak of Dnd tile" am: 6057a8360a
am: 465397e28e
Change-Id: I66d6f38d6f53251c0bc58d9ea49b4458d8b000f9
|
2016-10-13 14:30:09 +00:00 |
|
Selim Cinek
|
e58f1e5965
|
Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" am: 6f3a05ae77 -s ours
am: 20307881d7 -s ours
Change-Id: I14e0635d7ed1d7caf14f9217d5d0bf88685a738f
|
2016-10-13 14:29:21 +00:00 |
|
Selim Cinek
|
8bd7df4536
|
Merge "DO NOT MERGE - Added translations for emergency action string" am: d33e79c328 -s ours
am: cb654a5fbd -s ours
Change-Id: I54c256a00fa10c6eaffc6acb4108e81144ec2722
|
2016-10-13 14:28:39 +00:00 |
|
Robert Greenwalt
|
2b06e19f2d
|
Merge "Add free short codes for direct carrier billing and others" am: 73c50f7dbc
am: 6f8c54a16d
Change-Id: I3b7e0f86c18970ade30dc37d4d1f1365fc29be41
|
2016-10-13 14:27:50 +00:00 |
|
Shinji Sogo
|
b8bab1df10
|
Merge "Don't compare FQDN with providerFriendlyName" am: aae64557e1
am: 9c84160545
Change-Id: I9091af58eb06d5bf89847ac35aba9849e5e758cf
|
2016-10-13 14:27:05 +00:00 |
|
Adam Lesinski
|
c68597e671
|
Merge "RRO: Synchronize access to overlays.list" am: 78382db820
am: 1b9303e8f0
Change-Id: I3d6b143ffc5c08249e9a0be35c39b0e89b364c20
|
2016-10-13 14:26:07 +00:00 |
|
Jorim Jaggi
|
4e7407a80e
|
Merge "Fix split-screen flash issue" am: 6738617652
am: f1fed4de21
Change-Id: I67953f2bda3222ec53f0f6d2423df8287439ffe1
|
2016-10-13 14:25:15 +00:00 |
|
Rebecca Silberstein
|
d33a0ee710
|
Merge "Tethering: check if configManager is null" am: e011bf80c5
am: d1e4dbf002
Change-Id: I635dbc1b89c7e7458344f29979d5e62b37e2dd67
|
2016-10-13 14:24:19 +00:00 |
|
Brad Ebinger
|
0ab9a078e9
|
Merge "Transplant the Logging system from Telecom" am: cbb03d1ad3
am: 951dca8209
Change-Id: I954aeebe9375412cdbbbd49117b44131b33b8670
|
2016-10-13 14:23:04 +00:00 |
|
Christopher Wiley
|
53d12379f4
|
Merge "IndexOutOfBoundsException observed in ProcessStats" am: 6408e2e5cc
am: eedd2b529d
Change-Id: Ica176cd4b1bf569dfa03bdcefac622deddb57eca
|
2016-10-13 14:22:08 +00:00 |
|
John Reck
|
f136fa872f
|
Merge "Fix SurfaceViewPositionListener race bugs" am: 2dc11c0500
am: ee3adf6d91
Change-Id: Ie8740252ca7dd3dab200303e88d1bd82370bbf4e
|
2016-10-13 14:21:20 +00:00 |
|
Andre Eisenbach
|
d6a85bdea3
|
Merge "List HF_INDICATORS_VALUE_CHANGED broadcast as protected" am: 5c043f51b0
am: 3c3329bd34
Change-Id: I0e544c6d93caa8ef10289608ac9180ac6eeb59dd
|
2016-10-13 14:20:28 +00:00 |
|
Andreas Gampe
|
77a2f22f77
|
Merge "Debug: Use UniqueFile" am: 546f755bf8
am: 8d151b26c2
Change-Id: Idd34de736fb73a07bc8b2f9c37ecf3b2080f1512
|
2016-10-13 14:19:35 +00:00 |
|
Selim Cinek
|
8f681f7220
|
Merge "DO NOT MERGE - Added Emergency affordance feature" am: a0322d5c5a -s ours
am: 00c553e1ba -s ours
Change-Id: I7e41e24257827c592a15ef446c95dd173a5b055c
|
2016-10-13 14:18:41 +00:00 |
|
lei.peng
|
d975003af3
|
Merge "Modify the case in adjustFocus when the mFocusedActivity is null" am: 80587da3c1
am: 93c75d07c1
Change-Id: I5436618eb3ddd752a95caa5b0c427a3e32279a49
|
2016-10-13 14:17:59 +00:00 |
|
Stephen Li
|
7cbe133507
|
Merge "Add cdma_3waycall_flash_delay key to CarrierConfig" into stage-aosp-master
am: 6accb573ab
Change-Id: I4e30dd844a5709d652c178be1b56e8f6e339464f
|
2016-10-13 14:16:43 +00:00 |
|
Jordan Liu
|
90c20a884d
|
Add cdma_3waycall_flash_delay key to CarrierConfig
am: e5535d71fc
Change-Id: I5f23c160109bbdc951ff03c6d9912acfb09c03fd
|
2016-10-13 14:16:38 +00:00 |
|
Stephen Li
|
5428d11e23
|
Merge "Split the zygote logic out of android.os.Process into a new ZygoteProcess class." into stage-aosp-master
am: 302b99512f
Change-Id: I79c5b83245cfda542f9bcd05e389738d6fee7b39
|
2016-10-13 14:15:42 +00:00 |
|
Robert Sesek
|
adb4389cc1
|
Merge "resolve merge conflicts of 8f8d187 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
|
2016-10-13 14:13:39 +00:00 |
|
Yuta Yamada
|
465397e28e
|
Merge "Fix memory leak of Dnd tile"
am: 6057a8360a
Change-Id: Iabe8449a6703104d4dc14f67bad411fad7236e62
|
2016-10-13 13:10:12 +00:00 |
|
Treehugger Robot
|
6057a8360a
|
Merge "Fix memory leak of Dnd tile"
|
2016-10-13 13:00:45 +00:00 |
|
Vladislav Kuzkokov
|
69b6f159d7
|
Merge "Revert "Fix backup for users hit by erroneous backup disabling"" into nyc-mr1-dev am: b24489e20a
am: d469c4e8b6
Change-Id: I79bfb43f89e1d345731cc7abcf534fe65db596c0
|
2016-10-13 08:49:23 +00:00 |
|
Vladislav Kuzkokov
|
792e051ab8
|
Revert "Fix backup for users hit by erroneous backup disabling" am: 9f61d17e6a
am: 98a145b5af
Change-Id: I82ae89b2b0ebb5fefd44fec4f10184b6bb7123d3
|
2016-10-13 08:48:31 +00:00 |
|
Vladislav Kuzkokov
|
d469c4e8b6
|
Merge "Revert "Fix backup for users hit by erroneous backup disabling"" into nyc-mr1-dev
am: b24489e20a
Change-Id: Ie0f53964c521c89217347be67c16b8fe73ccc09d
|
2016-10-13 08:41:55 +00:00 |
|
Vladislav Kuzkokov
|
98a145b5af
|
Revert "Fix backup for users hit by erroneous backup disabling"
am: 9f61d17e6a
Change-Id: I460fbb670fbc7a724c981c4fceae0048ff4c9ded
|
2016-10-13 08:41:52 +00:00 |
|
Vladislav Kuzkokov
|
b24489e20a
|
Merge "Revert "Fix backup for users hit by erroneous backup disabling"" into nyc-mr1-dev
|
2016-10-13 08:34:20 +00:00 |
|
Julius D'souza
|
1e42c73f13
|
Merge "DO NOT MERGE: Ambient light sensor changes for doze mode." into cw-f-dev
am: 0dcdae30cf
Change-Id: I4f1e3de590645892d84c099260ed950eb2f64e8c
|
2016-10-13 07:54:00 +00:00 |
|
Julius D'souza
|
b7e6c16ac0
|
DO NOT MERGE: Ambient light sensor changes for doze mode.
am: c4e1e4909d
Change-Id: I797db8f2a8607723582bb705bd667bd981d5f16f
|
2016-10-13 07:53:55 +00:00 |
|
Julius D'souza
|
0dcdae30cf
|
Merge "DO NOT MERGE: Ambient light sensor changes for doze mode." into cw-f-dev
|
2016-10-13 07:43:19 +00:00 |
|
Julius D'souza
|
c4e1e4909d
|
DO NOT MERGE: Ambient light sensor changes for doze mode.
Bug: 18573988
Change-Id: I07eed120bdbefd23408921405466566da33c397d
|
2016-10-12 22:48:42 -07:00 |
|
Andrii Kulian
|
8111d4dcfc
|
Merge "DO NOT MERGE -- Adjust focus when moving task back" into nyc-mr1-dev am: 1fefc8b9fa
am: c4ceb50303
Change-Id: I48710a6b2b37827ab78285d9767e6368d481e830
|
2016-10-13 05:08:08 +00:00 |
|