Commit Graph

260611 Commits

Author SHA1 Message Date
Adrian Roos
93257a170a Merge \\"Allow trust agents to run during provisioning\\" into nyc-dev am: 1dd403b61a
am: 3d72ca32be

Change-Id: I980d01f48434a800153233d4c7ac43423d4d1f08
2016-06-21 18:17:47 +00:00
Adrian Roos
3d72ca32be Merge \"Allow trust agents to run during provisioning\" into nyc-dev
am: 1dd403b61a

Change-Id: Iff3055ccad07766b2529375a53b3fca60e41efcc
2016-06-21 18:10:56 +00:00
TreeHugger Robot
1dd403b61a Merge "Allow trust agents to run during provisioning" into nyc-dev 2016-06-21 18:04:07 +00:00
Bill Yi
8d32d76046 Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 284a71ecd6 -s ours
am: 0229697f0a  -s ours

Change-Id: I69f895ea4b3e1c87fa5c6c074273e2254948ab28
2016-06-21 17:32:36 +00:00
Bill Yi
59278c7af6 Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: d837e61078 -s ours
am: ad84195fd1  -s ours

Change-Id: I761f097fa7aaf2de619599c31a78c89f141e6d71
2016-06-21 17:32:29 +00:00
Bill Yi
1cb5638e00 Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 284a71ecd6 -s ours
am: 3e8b479eef  -s ours

Change-Id: Id77fd8478fd08eceb790dfb54ad1650e5c5862c1
2016-06-21 17:18:04 +00:00
Bill Yi
408c57cea2 Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: d837e61078 -s ours
am: 4d0beea677  -s ours

Change-Id: I1e719409452ecead352ddf1254b8f2de4a61bbc0
2016-06-21 17:18:01 +00:00
Sanket Padawe
ac9cfbf548 Merge \"Unhide Network types in TelephonyManager\" into nyc-mr1-dev
am: 0df9721a08

Change-Id: I967f047882ef07aa8d5deb88a5ad379a3b37257d
2016-06-21 17:17:58 +00:00
Bill Yi
29b76a080b Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 177fa1f3a0  -s ours

Change-Id: I11b6a5a2a997f8f91422e720ef2f840a0f9e1526
2016-06-21 17:17:50 +00:00
Bill Yi
493fa06f62 Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 81c6e4b4e0  -s ours

Change-Id: I512a428809562ba7ba6d3c0e4789051fec031c4a
2016-06-21 17:17:44 +00:00
Bill Yi
0229697f0a Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 284a71ecd6  -s ours

Change-Id: I3bc7c180ab44d5884292f87e57337c22f2e8110b
2016-06-21 17:13:55 +00:00
Bill Yi
ad84195fd1 Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: d837e61078  -s ours

Change-Id: Id84adf98244b231a35450cd6d8ae7194d475c202
2016-06-21 17:13:52 +00:00
Bill Yi
3e8b479eef Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 284a71ecd6  -s ours

Change-Id: I2fa02988a5341ac04c96f87389195349e71cc83d
2016-06-21 17:08:19 +00:00
Bill Yi
4d0beea677 Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: d837e61078  -s ours

Change-Id: Ic3a26c3fa5e0ac0762eb79b29b23f72c82b5bb74
2016-06-21 17:08:17 +00:00
Sanket Padawe
0df9721a08 Merge "Unhide Network types in TelephonyManager" into nyc-mr1-dev 2016-06-21 16:56:24 +00:00
TreeHugger Robot
177fa1f3a0 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-21 16:52:40 +00:00
TreeHugger Robot
81c6e4b4e0 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-21 16:52:29 +00:00
TreeHugger Robot
284a71ecd6 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-21 16:52:06 +00:00
TreeHugger Robot
d837e61078 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-21 16:51:52 +00:00
Fan Zhang
009b86ae02 Merge \"Add metrics for button taps in Settings support tab.\" into nyc-mr1-dev
am: 03e387e5b5

Change-Id: Id8e0c05c7662cbad7cf51cb5708dddc9bc130ecf
2016-06-21 15:35:03 +00:00
Fan Zhang
03e387e5b5 Merge "Add metrics for button taps in Settings support tab." into nyc-mr1-dev 2016-06-21 15:28:31 +00:00
Android Build Merger (Role)
aadcf202fa Merge "Merge \\"Only block invalidation in DrawableContainer initialization\\" into nyc-dev am: 7a372a13af am: e77dc4fe06" into nyc-mr1-dev-plus-aosp 2016-06-21 14:00:13 +00:00
Alan Viverette
b358731d46 Merge \\"Only block invalidation in DrawableContainer initialization\\" into nyc-dev am: 7a372a13af
am: e77dc4fe06

Change-Id: I4a5f3171aee17e27ce4ab53f9f422feb6eadbbbd
2016-06-21 13:59:40 +00:00
Alan Viverette
fdc99784c7 Merge \\"Only block invalidation in DrawableContainer initialization\\" into nyc-dev am: 7a372a13af
am: 9b81f5bfaf

Change-Id: I23aa33f0a65e311fcb0db3884216666c1d6bc01c
2016-06-21 13:59:29 +00:00
Alan Viverette
9b81f5bfaf Merge \"Only block invalidation in DrawableContainer initialization\" into nyc-dev
am: 7a372a13af

Change-Id: If818fb8f01f5a20217cb57d232eb1e1afd516be6
2016-06-21 13:54:03 +00:00
Alan Viverette
e77dc4fe06 Merge \"Only block invalidation in DrawableContainer initialization\" into nyc-dev
am: 7a372a13af

Change-Id: I21a7dbf975a8dca02d87b9a0f084a6af74d55834
2016-06-21 13:53:49 +00:00
Alan Viverette
7a372a13af Merge "Only block invalidation in DrawableContainer initialization" into nyc-dev 2016-06-21 13:47:21 +00:00
Sreevani Sreejith
2b7ac67f0f Merge \\\\"Documented how to handle advertisements during audio playback.\\\\" into mnc-io-docs am: 07340a654a am: 5fef4a7d44 am: 41a7bdec97
am: 03aaf8e264

Change-Id: I765337fbf7bdb5b076c31e3b315d31c97bb197d2
2016-06-21 12:06:42 +00:00
Sreevani Sreejith
303c07cc6d Merge \\\\"Documented how to handle advertisements during audio playback.\\\\" into mnc-io-docs am: 07340a654a am: 5fef4a7d44 am: 41a7bdec97
am: 09bfc29d17

Change-Id: I56d8dd1efe3d2e721501898691fd41923131239c
2016-06-21 12:02:14 +00:00
sreevanis
03aaf8e264 Merge \\\"Documented how to handle advertisements during audio playback.\\\" into mnc-io-docs am: 07340a654a am: 5fef4a7d44
am: 41a7bdec97

Change-Id: I0787c301ab85f1ff866b1d1eb7c4845186da8f2e
2016-06-21 11:59:13 +00:00
sreevanis
09bfc29d17 Merge \\\"Documented how to handle advertisements during audio playback.\\\" into mnc-io-docs am: 07340a654a am: 5fef4a7d44
am: 41a7bdec97

Change-Id: Ic6578db4f8d59387974be01b74bd28b86abde176
2016-06-21 11:58:53 +00:00
Sreevani Sreejith
41a7bdec97 Merge \\"Documented how to handle advertisements during audio playback.\\" into mnc-io-docs am: 07340a654a
am: 5fef4a7d44

Change-Id: Ica1016e018fe5e278babd490b631414ad220f290
2016-06-21 11:55:54 +00:00
sreevanis
5fef4a7d44 Merge \"Documented how to handle advertisements during audio playback.\" into mnc-io-docs
am: 07340a654a

Change-Id: I58c4cb8ec6d86a1bb1464a4fedd14ff21ab3a863
2016-06-21 11:50:22 +00:00
Sreevani Sreejith
07340a654a Merge "Documented how to handle advertisements during audio playback." into mnc-io-docs 2016-06-21 11:44:20 +00:00
sreevanis
0c820aa9e1 Documented how to handle advertisements during audio playback.
Bug:24986554
Change-Id: I02cc0500492661ae7cde6cdae30490c00f8e4b97
2016-06-21 04:41:33 -07:00
Andrei Stingaceanu
0fcea07ec8 Merge \"Keyboard shortcuts: A11Y fixes cherry pick\" into nyc-mr1-dev
am: 448160e1e9

Change-Id: I56e0a7f8ffacc6af45bfd5326527671b6e6aee80
2016-06-21 09:36:23 +00:00
Andrei Stingaceanu
448160e1e9 Merge "Keyboard shortcuts: A11Y fixes cherry pick" into nyc-mr1-dev 2016-06-21 09:28:59 +00:00
Chris Banes
09bf9e69bc Fix NPE in Toolbar - framework edition
am: 3b925c1ab0

Change-Id: I340ddff981e938bf6f9bd3f1392eec03f25f3e5d
2016-06-21 08:16:28 +00:00
Chris Banes
3b925c1ab0 Fix NPE in Toolbar - framework edition
Caused by super constructor calling non-final methods
which Toolbar overrides, and then tries to reference
final variables.

BUG: 28806107
Change-Id: Ieaf5f7611dbbf954e49c31e604aa2f7627248615
2016-06-21 08:09:24 +00:00
Bill Yi
3eeeada9a1 Import translations. DO NOT MERGE
Change-Id: I09c2d72040aabd804cc592de9b61f9a41cb60fc8
Auto-generated-cl: translation import
2016-06-21 01:08:26 -07:00
Bill Yi
1fbf42ce30 Import translations. DO NOT MERGE
Change-Id: I8c3ebf247f9029af5c1322e2a5c115a1d854196f
Auto-generated-cl: translation import
2016-06-21 00:53:23 -07:00
Bill Yi
3eeb6447d8 Import translations. DO NOT MERGE
Change-Id: I4d7cc365a08a8c59e242fc7450606a549812799a
Auto-generated-cl: translation import
2016-06-21 00:45:59 -07:00
Bill Yi
dafd8ad2cf Import translations. DO NOT MERGE
Change-Id: I8d44c51c82552053591fd0f45741f5cf05c956d6
Auto-generated-cl: translation import
2016-06-21 00:24:26 -07:00
Android Build Merger (Role)
f7c377f0ba Merge "Merge \\"Compare intent filter when launching adjacent\\" into nyc-dev am: 9980514ee0 am: b809d1cb79" into nyc-mr1-dev-plus-aosp 2016-06-21 05:35:44 +00:00
Andrii Kulian
792d0b4f17 Merge \\"Compare intent filter when launching adjacent\\" into nyc-dev am: 9980514ee0
am: b809d1cb79

Change-Id: Ia19c62e34dc1c64be600641c31f9825b1fe0e788
2016-06-21 05:33:59 +00:00
Andrii Kulian
1f52fe8ee7 Merge \\"Compare intent filter when launching adjacent\\" into nyc-dev am: 9980514ee0
am: 4f47b392cc

Change-Id: I49d1f1e08d9b917f4ba83316d7e6a37f42b72c8f
2016-06-21 05:33:50 +00:00
Andrii Kulian
4f47b392cc Merge \"Compare intent filter when launching adjacent\" into nyc-dev
am: 9980514ee0

Change-Id: Icdd46a5b4735f04d8e82cd5ffb34bfd9066a431f
2016-06-21 05:27:27 +00:00
Andrii Kulian
b809d1cb79 Merge \"Compare intent filter when launching adjacent\" into nyc-dev
am: 9980514ee0

Change-Id: I8c2b03438fdeed6bce12489c5639245b79097577
2016-06-21 05:27:24 +00:00
Andrii Kulian
9980514ee0 Merge "Compare intent filter when launching adjacent" into nyc-dev 2016-06-21 05:18:00 +00:00
Android Build Merger (Role)
2f20dd2e26 Merge "Merge \\"Parse \\"vendor/priv-app\\" to find privileged applications\\" into nyc-dev am: 8a1bc54ab0 am: bc7e15eedc" into nyc-mr1-dev-plus-aosp 2016-06-21 03:08:42 +00:00