Scott Main
82808fb000
am 1ff0131e: am fc0ea7ea: docs: add oem driver for alcatel
...
* commit '1ff0131e77e625af3100720a3552dc1f4064421d':
docs: add oem driver for alcatel
2011-05-16 10:24:28 -07:00
Scott Main
45d5a051ad
am fc0ea7ea: docs: add oem driver for alcatel
...
* commit 'fc0ea7ea5de429d9eea7f13bca42b98081d38dc5':
docs: add oem driver for alcatel
2011-05-16 10:20:59 -07:00
Wink Saville
ff78de7c53
am a1c29d30: Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE
...
* commit 'a1c29d30f342c2d3dbf7022f1b130934c2519b81':
Support for Vendor RIL dump of baseband logs
2011-05-15 14:43:52 -07:00
Wink Saville
51d3a78406
am 92cc1d20: Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE
...
* commit '92cc1d20ae0e3dc7e0618027967145e26c1cb6e2':
Telephony: Handle Icc Status Changed Event.
2011-05-15 14:43:49 -07:00
Wink Saville
b20191867e
Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE
2011-05-15 14:39:16 -07:00
Wink Saville
079aa0daf8
Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE
2011-05-15 14:38:59 -07:00
Robert Greenwalt
37f8fca868
am 9713e3c6: Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE
...
* commit '9713e3c60def9d755ae828d389fced4793a3c86a':
Fix bevhavior of fetchDunApn.
2011-05-15 08:03:46 -07:00
Robert Greenwalt
22f76d0082
Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE
2011-05-15 07:53:50 -07:00
Wink Saville
ac0abc1a61
am 6e41b32d: Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE
...
* commit '6e41b32dd08a866cb7158b387646e96c9105831b':
TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING.
2011-05-14 07:43:00 -07:00
Wink Saville
97f87eb6a8
Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE
2011-05-14 07:35:21 -07:00
Scott Main
d1f60e04d7
am 3cd61e2b: am 084d3490: am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
...
* commit '3cd61e2bca2df05a9ad3679c7456b077f2d04f2b':
docs: update homepage I/O announcement
2011-05-13 20:34:11 -07:00
Scott Main
6c344c7803
am 084d3490: am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
...
* commit '084d3490a5283088426058d3c15532b176367926':
docs: update homepage I/O announcement
2011-05-13 20:32:32 -07:00
Scott Main
3fce43da30
am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
...
* commit 'f73dcad35d031afc8e4db767d9b8bc40f389e4fc':
docs: update homepage I/O announcement
2011-05-13 20:29:45 -07:00
Scott Main
ebbc478d9b
Merge "docs: update homepage I/O announcement" into honeycomb-mr1
2011-05-13 20:26:56 -07:00
Dianne Hackborn
ade8cd9080
am ed9321ab: am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
...
* commit 'ed9321ab5d282e40e7c5fa9caf0eb9d05646f2d0':
DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
2011-05-13 18:41:04 -07:00
Dianne Hackborn
923d3e4e36
am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
...
* commit 'f9dd34f4d3203fd50363b3b0247c5d0db6fe2c8f':
DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
2011-05-13 18:39:01 -07:00
Xavier Ducrohet
b35013083f
am 6d040a7f: am 738c5e60: am 2fae858d: LayoutLib: implement data binding for most AdapterView
...
* commit '6d040a7f20de29a9667dd81bd4de40a9e56fd341':
LayoutLib: implement data binding for most AdapterView
2011-05-13 16:36:16 -07:00
Xavier Ducrohet
a20e479072
am 738c5e60: am 2fae858d: LayoutLib: implement data binding for most AdapterView
...
* commit '738c5e6072459c772064c96233cf59639bbfe2fd':
LayoutLib: implement data binding for most AdapterView
2011-05-13 16:32:47 -07:00
Xavier Ducrohet
0c36d14f6b
am 2fae858d: LayoutLib: implement data binding for most AdapterView
...
* commit '2fae858db55fc6984ef923a6226b9408c37c72cb':
LayoutLib: implement data binding for most AdapterView
2011-05-13 16:30:44 -07:00
Dianne Hackborn
7f1489bc4b
am 7d87c37b: am 6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
...
* commit '7d87c37b031616259d1db6a78ecb1ff20ee5ff5c':
Fix a bug where an action bar could be created when it should not be.
2011-05-13 16:29:40 -07:00
Dianne Hackborn
e50994f021
am 6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
...
* commit '6121f06ed5847d1edd22b23c3b28bf3b3e3af602':
Fix a bug where an action bar could be created when it should not be.
2011-05-13 16:26:44 -07:00
Dianne Hackborn
bd2fecd927
Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
2011-05-13 16:24:32 -07:00
Dianne Hackborn
ac26a1fcc2
am 6824c135: am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
...
* commit '6824c135fe9639c74f38f125d678c20065c3347c':
DO NOT MERGE. Integrate fragment work from master
2011-05-13 15:45:23 -07:00
Dianne Hackborn
d26eaf683d
am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
...
* commit 'f3f2d731e19bb47a87dc071a5750fc0f18248da2':
DO NOT MERGE. Integrate fragment work from master
2011-05-13 15:36:48 -07:00
Dianne Hackborn
a15868e6cb
Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
2011-05-13 15:33:21 -07:00
Jeff Brown
292eebb698
am 2bdb756c: am 4fb76253: Fix bounds check. Bug: 4413945
...
* commit '2bdb756cdfc5e5d19e1621ae4a603b27963d6a5c':
Fix bounds check. Bug: 4413945
2011-05-13 13:07:44 -07:00
Jeff Brown
b7341bf80c
am 4fb76253: Fix bounds check. Bug: 4413945
...
* commit '4fb76253f255f0adb8a64835af37bb9176ee4016':
Fix bounds check. Bug: 4413945
2011-05-13 13:04:28 -07:00
Dianne Hackborn
89178d4de2
am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
...
* commit '46a282f323bc05606e4fe1eba795bd9ac7c99819':
DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
2011-05-13 11:21:26 -07:00
Dianne Hackborn
ed49d546d1
am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
...
* commit '0ed2e845db3f6bc7bc12a08ada18363942c2fb3d':
DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
2011-05-13 11:18:40 -07:00
Dianne Hackborn
29a781c814
Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
2011-05-13 11:16:42 -07:00
Scott Main
40b3400124
am 4c53fc7e: am 78b875e7: am edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
...
* commit '4c53fc7ec921c0959f021a475fe0d91b7e6ddc2d':
docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
2011-05-13 11:03:27 -07:00
Scott Main
1e27f48ccd
am 2a959725: am d32aeafc: am 432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
...
* commit '2a959725f569147878b3a78fae77e8679c8e16fa':
docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
2011-05-13 11:01:25 -07:00
Scott Main
fcfe82e63f
am 78b875e7: am edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
...
* commit '78b875e7e65ee90e44872d6542c5eb4213ba0dfb':
docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
2011-05-13 11:00:27 -07:00
Scott Main
6145b9defc
am d32aeafc: am 432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
...
* commit 'd32aeafc41b018b7efbddd1b90e17424bf1cf1e7':
docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
2011-05-13 10:58:29 -07:00
Scott Main
74c4d84a19
am edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
...
* commit 'edab852fe11f12ad5a0a66f79462ed7474ba9e5a':
docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
2011-05-13 10:56:52 -07:00
Scott Main
9fed145eb4
am 432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
...
* commit '432fbcc55ff3e0900a50b70b9d5dbdab77a276f7':
docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
2011-05-13 10:55:09 -07:00
Scott Main
f87d9feac1
Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
2011-05-13 10:54:00 -07:00
Wink Saville
e7afca1967
am 55ab1ac2: Merge "Add getLteOnCdamMode." into honeycomb-LTE
...
* commit '55ab1ac27f0e5ba6169e38b9ced197a9ff588f2b':
Add getLteOnCdamMode.
2011-05-13 09:20:08 -07:00
Wink Saville
b6a14cb262
Merge "Add getLteOnCdamMode." into honeycomb-LTE
2011-05-13 09:09:43 -07:00
Dianne Hackborn
88c0d696cc
DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
...
You can now specify resource configuration variants "wNNNdp"
and "hNNNdp". These are the minimum screen width/height in "dp"
units. This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.
This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes. Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted. To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.
Change-Id: I4acb73d82677b74092c1da9e4046a4951921f9f4
2011-05-12 18:39:51 -07:00
Dianne Hackborn
27800cb19d
am d46849a5: am a8138732: MR2 is going to be API 13.
...
* commit 'd46849a535ab64fd47fc8e9c557ca5f4da9e977b':
MR2 is going to be API 13.
2011-05-12 17:39:30 -07:00
Dianne Hackborn
661b5e1bad
am 51454295: am df9799f0: Fix build.
...
* commit '51454295a5813627a91dd5cf6b486a70a0b389cb':
Fix build.
2011-05-12 17:39:22 -07:00
Irfan Sheriff
6a622ba66a
am 2cd423a0: Merge commit \'01ea7f01\' into manualmerge1
...
* commit '2cd423a049aeeb0c07f7a556f3a6f701b504606f':
DO NOT MERGE Add DhcpStateMachine
2011-05-12 17:37:06 -07:00
Dianne Hackborn
dfce045584
am a8138732: MR2 is going to be API 13.
...
* commit 'a8138732a01b92f0a40f72050b74a3bd4cf6d215':
MR2 is going to be API 13.
2011-05-12 17:35:35 -07:00
Dianne Hackborn
8fbbfe5bac
am df9799f0: Fix build.
...
* commit 'df9799f0fc3ef04d9b004ebbda44883f85321b24':
Fix build.
2011-05-12 17:35:20 -07:00
Irfan Sheriff
a4bb9e57a5
Merge commit '01ea7f01' into manualmerge1
2011-05-12 17:19:56 -07:00
Irfan Sheriff
fd7d4cf691
am bb09485b: Merge commit \'09564fbb\' into manualmerge
...
* commit 'bb09485bcb36a2d5cf4d7760bfd89807bb3be573':
DO NOT MERGE Define Protocol class
2011-05-12 16:02:43 -07:00
Jean-Baptiste Queru
194cda3d98
am 2d7d3f78: (-s ours) am f247e545: Merge "Adapt to latest skia"
...
* commit '2d7d3f78c90734c8067ab76b8f5daca84a311c92':
Adapt to latest skia
2011-05-12 15:54:13 -07:00
Jean-Baptiste Queru
38b210943c
am a84d29cb: am 6714e677: Merge "Ninepatch tweaks for better interop"
...
* commit 'a84d29cb0494310e9472884c7a459603eb305e38':
Ninepatch tweaks for better interop
2011-05-12 15:52:16 -07:00
Jean-Baptiste Queru
6e6afad3f0
am 20fd3f0d: am 4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility."
...
* commit '20fd3f0d83d4665a6ac33a10f4a48a0f6f159068':
Tweak audio APIs for better forward/backward/sideways compatibility.
2011-05-12 15:52:12 -07:00