Robert Greenwalt
759efacd2d
am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
...
* commit 'ef568c97b5962249cbab7995f76435492a10ba68':
Make new networkAttribute parameter non-optional.
2011-04-26 00:23:03 -07:00
Robert Greenwalt
af2eb4f6db
Make new networkAttribute parameter non-optional.
...
Dependencymet sets the default dep-met value for the network. Should
be set to true unless you know what you're doing.
Change-Id: Ifa3765a97615f5333da07bce9defdb8600275129
2011-04-25 16:04:45 -07:00
Robert Greenwalt
f4a29403ae
resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp
...
Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f
2011-04-07 14:13:52 -07:00
Robert Greenwalt
70c3d1c23b
Merge "Add external dependency API." into honeycomb-LTE
2011-04-07 13:02:28 -07:00
Robert Greenwalt
d55a6b498d
Add external dependency API.
...
An APN will not be connected to if some external dependency is not met.
bug:3486704
Change-Id: I7d94df343b260013efd11faa978deb13f07f1389
2011-04-07 12:28:37 -07:00
Eric Fischer
bef09dc022
am ad3bddab: am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'ad3bddab9246933971ff1b5360b0915e55579fe7':
Import revised translations. DO NOT MERGE
2011-04-06 14:16:12 -07:00
Eric Fischer
ad3bddab92
am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '9f2f650f26941a7cd4931afc66f39918e7c2817c':
Import revised translations. DO NOT MERGE
2011-04-06 14:12:31 -07:00
Eric Fischer
6d5f5faae0
Import revised translations. DO NOT MERGE
...
Change-Id: I30c20fa78fc821c943d947a058f482e87d70dbd6
2011-04-06 13:47:57 -07:00
Jason parks
5ee250aa74
am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread
...
* commit '1d73362597c49f4692a580460bc8697a8f1d0efa':
Send out a broadcast that the system is being factory reset.
2011-04-04 16:43:34 -07:00
Jason parks
1d73362597
am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread
...
* commit 'cca2f2f987ab772a4bae3176df7259f59d6502ce':
Send out a broadcast that the system is being factory reset.
2011-04-04 12:20:33 -07:00
Justin Ho
0b39731431
am 0b251aec: am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1
...
* commit '0b251aec4307d566ebb1a95f8b1136d6d5b8d5a6':
Replacing browser playback controls for inactive videos Bug: 4136024
2011-03-30 16:00:50 -07:00
Justin Ho
0b251aec43
am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1
...
* commit '01b13a11e6492ebba66c496eaefdb008f2638870':
Replacing browser playback controls for inactive videos Bug: 4136024
2011-03-30 15:59:19 -07:00
Jeff Hamilton
016f884747
am b9896794: am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
...
* commit 'b98967942e9a764b80abc8ff1c6f6f2d620c0f7a':
Make STOP_APP_SWITCHES signatureOrSystem.
2011-03-30 15:18:30 -07:00
Justin Ho
c7de6dd483
Replacing browser playback controls for inactive videos
...
Bug: 4136024
Change-Id: I1c48023005d711d5080fa17a695f709705e362b6
2011-03-30 14:21:28 -07:00
Jeff Hamilton
b98967942e
am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
...
* commit '96cf34d362a1666683e813af915e4f6e0d1b38a0':
Make STOP_APP_SWITCHES signatureOrSystem.
2011-03-30 09:30:40 -07:00
Jason parks
cca2f2f987
Merge "Send out a broadcast that the system is being factory reset." into gingerbread
2011-03-30 08:17:53 -07:00
Eric Fischer
bc2489e4c5
am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'f5cedbe508c46c27a6ce1554aed919bfbfc6fc4e':
Import revised translations. DO NOT MERGE
2011-03-29 12:20:42 -07:00
Eric Fischer
627e59ad08
Import revised translations. DO NOT MERGE
...
Change-Id: I962bb9917aa3f3d4b911c1ad7fdfbcda94afa0c7
2011-03-29 11:58:23 -07:00
Jeff Hamilton
10de0b31df
Make STOP_APP_SWITCHES signatureOrSystem.
...
The NFC service relies on this permission
for it's dispatching mechanism and it is
no longer signed with the platform cert.
Bug: 4173610
Change-Id: I598ad2889c4af307f04433093923255fe7daedbb
2011-03-25 16:17:53 -05:00
Eric Fischer
b05f0b84b2
am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '3a2575f7e6b1f6da97bd8233dfd3baa8883c5610':
Import revised translations. DO NOT MERGE
2011-03-22 13:59:20 -07:00
Eric Fischer
765ae04f61
Import revised translations. DO NOT MERGE
...
Change-Id: I705ed1f382974b8b12dc024cdb9e2f026e6e86b8
2011-03-22 13:38:10 -07:00
Simon Wilson
03aa986e6b
am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread
...
* commit '1ba4897e89fc30042a086b26755dfdb80af258dd':
DO NOT MERGE Change WiMAX indicator display
2011-03-21 18:02:57 -07:00
Justin Ho
6a21161095
am 9db9a7d3: Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1
...
* commit '9db9a7d3f4428552b3ce553df5184bcbbe8db8dd':
Fixing list selector theme Bug: 4147203
2011-03-21 17:59:59 -07:00
TK MUN
081148dd32
DO NOT MERGE Change WiMAX indicator display
...
Change WiMAX indicator display from data to signal indication
and add a new icon set.
Change-Id: I610f186e07f3d7af9e64bcbdd750371164ac51f5
2011-03-21 16:55:00 -07:00
Justin Ho
c16168091a
Fixing list selector theme
...
Bug: 4147203
Change-Id: Ib9052ca399a135d42fd5c6ccf2bea8babfe8f0ac
2011-03-21 15:04:23 -07:00
Eric Fischer
9ac8260608
am c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'c0604255a71c0b7114c3f011519160d4812a8100':
Import revised translations. DO NOT MERGE
2011-03-18 16:06:41 -07:00
Teng-Hui Zhu
eb52fb3229
am 7eaf4831: Merge "Asset for video poster" into honeycomb-mr1
...
* commit '7eaf483140f1c42f29c7cde71061521280b253ce':
Asset for video poster
2011-03-18 15:22:03 -07:00
Teng-Hui Zhu
7eaf483140
Merge "Asset for video poster" into honeycomb-mr1
2011-03-18 15:19:28 -07:00
Eric Fischer
3e3f521aed
Import revised translations. DO NOT MERGE
...
Change-Id: I48a01203c2db75bc6a1c6dc251264780d845443d
2011-03-18 15:10:32 -07:00
Teng-Hui Zhu
70455a194e
Asset for video poster
...
bug:4136024
Change-Id: I2b847948446285a2121578a4809f90a48d0c6019
2011-03-18 15:01:34 -07:00
Justin Ho
dd8f926841
am 5dbd0978: Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1
...
* commit '5dbd0978cd7f2d3ff1e28bbfdef2f757de28e1bc':
Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF
2011-03-17 17:55:58 -07:00
Justin Ho
5dbd0978cd
Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1
2011-03-17 16:49:32 -07:00
Eric Fischer
b05fea7dc5
am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'e6ef8d0b75494e8d1e8f619b2a461c11fe8fb965':
Import revised translations. DO NOT MERGE
2011-03-17 13:32:58 -07:00
Eric Fischer
00436f9bfb
Import revised translations. DO NOT MERGE
...
Change-Id: I774c6b4e13d3cb53b2364360f6f888e548110e7f
2011-03-17 13:11:01 -07:00
Eric Fischer
c657fcce45
am 20ccaf6c: Import revised translations. DO NOT MERGE
...
* commit '20ccaf6cc1a79a3f7973e5875c66e2bce2ebee7c':
Import revised translations. DO NOT MERGE
2011-03-16 17:10:09 -07:00
Eric Fischer
20ccaf6cc1
Import revised translations. DO NOT MERGE
...
Change-Id: I59b21268d693f0fac87e787fceb4f41b3f3e6acd
2011-03-16 16:48:09 -07:00
Justin Ho
33cb33d7de
Updated copy/paste/cut assets for AB
...
Removing old unnecessary assets from tree
Bug: 6699FF
Change-Id: I8df98326917d99febdabcb8b62f3dbbff06d67c8
2011-03-16 15:09:17 -07:00
Eric Fischer
d5eb3bbbf2
am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'cc571e9643865edc3f25aa133c467ace46ce8e80':
Import revised translations. DO NOT MERGE
2011-03-16 10:51:56 -07:00
Eric Fischer
cc571e9643
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-16 10:23:02 -07:00
Eric Fischer
326c1c7247
Import revised translations. DO NOT MERGE
...
Change-Id: I654f633a58cb935a3388e5b558101912dae7fde7
2011-03-16 10:11:58 -07:00
Jason parks
4ca74dc4c2
Send out a broadcast that the system is being
...
factory reset.
Change-Id: I339b7ce58cb3f48316103be49b582d4f7e9b63bf
2011-03-16 09:29:47 -05:00
Justin Ho
6ad9cc9afd
am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1
...
* commit '6764ecf8630af4c6260007e688cea0056ecf4ec7':
Integrating new ADB USB debugging asset Bug: #6699FF
2011-03-15 23:44:12 -07:00
Justin Ho
750a4a2623
am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1
...
* commit '141505a9769099ac38eacb62409a75ff891860a1':
Fix expander list group indicator Bug: #6699FF
2011-03-15 23:44:08 -07:00
Eric Fischer
a78327da45
am acca1600: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'acca16004fd58c2b8c489f031281b58551551dc8':
Import revised translations. DO NOT MERGE
2011-03-15 23:29:10 -07:00
Justin Ho
6764ecf863
Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1
2011-03-15 16:52:07 -07:00
Justin Ho
141505a976
Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1
2011-03-15 16:47:27 -07:00
Justin Ho
75fe135e62
Integrating new ADB USB debugging asset
...
Bug: #6699FF
Change-Id: Iab8debef59178d56ea78883a5737b7614649f948
2011-03-15 16:40:36 -07:00
Justin Ho
a5c064e0d9
Fix expander list group indicator
...
Bug: #6699FF
Change-Id: I48f2ecb2246ad5d5e11d7e9122b6ef90c764b571
2011-03-15 16:38:58 -07:00
Eric Fischer
4670b4d95c
Import revised translations. DO NOT MERGE
...
Change-Id: Ief48781413cadb2a9bd786974e4688ac222d7b36
2011-03-15 14:40:53 -07:00
Amith Yamasani
4a04f11b43
am 7e978441: Merge "Use more padding on the sides for SearchView" into honeycomb-mr1
...
* commit '7e978441eeed9defb1031cc17c2857cf06cf825a':
Use more padding on the sides for SearchView
2011-03-15 12:50:35 -07:00