Scott Main
faf66ad13f
am c932a56a: am d7f739b1: am 114ba198: am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb
...
* commit 'c932a56ac84d680fd8f38c913c7e76105cfc0597':
docs: fix for Misdirected link in topic Declaring Layout bug 4257430
2011-04-28 14:34:29 -07:00
Scott Main
319d596af7
am d7f739b1: am 114ba198: am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb
...
* commit 'd7f739b13e0336d6dd02df18d16a73636a795c3f':
docs: fix for Misdirected link in topic Declaring Layout bug 4257430
2011-04-28 14:32:02 -07:00
Scott Main
fe1d9165b2
am 114ba198: am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb
...
* commit '114ba198f5ae19fc0a632e18369a912c54a0c44e':
docs: fix for Misdirected link in topic Declaring Layout bug 4257430
2011-04-28 14:25:22 -07:00
Scott Main
bbb3bad7e3
am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb
...
* commit 'c59e80c4eb60a0ba665571fee2f9561aa6e936ff':
docs: fix for Misdirected link in topic Declaring Layout bug 4257430
2011-04-28 14:21:46 -07:00
Scott Main
dae3b8228c
Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb
2011-04-28 14:08:57 -07:00
Wink Saville
b1c9c24aba
am 418e486a: am a68a61df: Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE
...
* commit '418e486a1cae97fccaa4da0128f255685d9a7e12':
Telephony: Data availability indication upon records loaded.
2011-04-28 13:55:59 -07:00
Wink Saville
af69b5740e
am a68a61df: Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE
...
* commit 'a68a61dfe37969426c535d076a20181155493226':
Telephony: Data availability indication upon records loaded.
2011-04-28 13:54:14 -07:00
Wink Saville
9aff4fb142
am f49a96aa: am 05fcd239: Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE
...
* commit 'f49a96aa7683bba0536a68f2c043905c6c5f92fb':
Telephony: Corrections to signal strength values.
2011-04-28 13:54:04 -07:00
Kazuhiro Ondo
4811e68b2f
am 5bc9d478: am 379cbb1d: Send STK Service Running RIL Request after sim module is ready
...
* commit '5bc9d478517739bdcd79951e865f26481b79ddfc':
Send STK Service Running RIL Request after sim module is ready
2011-04-28 13:54:01 -07:00
Wink Saville
baadff842b
am 05fcd239: Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE
...
* commit '05fcd239abcdfe0c39e1d1d1f462478bf1e68e04':
Telephony: Corrections to signal strength values.
2011-04-28 13:52:28 -07:00
Kazuhiro Ondo
4a92266355
am 379cbb1d: Send STK Service Running RIL Request after sim module is ready
...
* commit '379cbb1dcc4f9c7f4ca485bc34ec056e87456c8d':
Send STK Service Running RIL Request after sim module is ready
2011-04-28 13:52:26 -07:00
Wink Saville
c0f6e31b51
Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE
2011-04-28 13:51:31 -07:00
Wink Saville
408297f4bd
Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE
2011-04-28 13:51:22 -07:00
Conley Owens
044fb5186f
am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message"
...
* commit 'e6e3322a3baef4cce7d382a7890718a805c4bd3b':
Remove duplicate '=' in exception message
2011-04-28 12:00:53 -07:00
Conley Owens
65c7f2b723
am 8fff7805: Merge "Remove duplicate \'=\' in exception message"
...
* commit '8fff7805ab1ccde8321697116ed3dd2fae5340ed':
Remove duplicate '=' in exception message
2011-04-28 11:57:48 -07:00
Wink Saville
6e26871292
am 7848b71b: am 7353301f: Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE
...
* commit '7848b71b4ff0d50030b528db931d5460b2a3e9e8':
GsmDCT: Reset DataConnection upon APN disable.
2011-04-28 11:55:00 -07:00
Wink Saville
acf4f57ed8
am e4c7f3ba: am 1a517d0c: Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE
...
* commit 'e4c7f3ba0fd3cb8f2fce39cd76c36c0df3692eae':
Remove subclass cast for calls to isDnsCheckDisabled.
2011-04-28 11:54:57 -07:00
Wink Saville
01669bef31
am 69e830dc: am 8daec83f: Merge "Delay data reconnection after disconnected." into honeycomb-LTE
...
* commit '69e830dc31a4f6fc19d8392efede114afd20fe7b':
Delay data reconnection after disconnected.
2011-04-28 11:54:54 -07:00
Stephen Hines
77e908da38
Merge "Fix RS graphics samples/tests."
2011-04-28 11:54:29 -07:00
Wink Saville
f2a8bdd2f6
am 7353301f: Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE
...
* commit '7353301f73bfd0fd54ca515f3385946abe56d620':
GsmDCT: Reset DataConnection upon APN disable.
2011-04-28 11:53:08 -07:00
Wink Saville
610b3d397d
am 1a517d0c: Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE
...
* commit '1a517d0c251d2ca577500ec6c0e434725c3ddd21':
Remove subclass cast for calls to isDnsCheckDisabled.
2011-04-28 11:53:05 -07:00
Wink Saville
77bee31d87
am 8daec83f: Merge "Delay data reconnection after disconnected." into honeycomb-LTE
...
* commit '8daec83f9a3436819854827bcff480ce0a203ddb':
Delay data reconnection after disconnected.
2011-04-28 11:53:02 -07:00
Irfan Sheriff
e2ed2b2421
am c1f39396: am 8f87f838: Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE
...
* commit 'c1f39396b94837f728c56b4c3e2f5c37e1d0eef7':
Define Protocol class for use with StateMachine
2011-04-28 11:52:56 -07:00
Wink Saville
0f0849b904
Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE
2011-04-28 11:50:24 -07:00
Wink Saville
afe66645a2
Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE
2011-04-28 11:50:15 -07:00
Wink Saville
0ece71bf39
Merge "Delay data reconnection after disconnected." into honeycomb-LTE
2011-04-28 11:50:05 -07:00
Conley Owens
8551e75b10
am a60594cb: Fixed bad merge in ViewRoot.java.
...
* commit 'a60594cb1c1399f557a82403f7fc7abb7af55250':
Fixed bad merge in ViewRoot.java.
2011-04-28 11:49:43 -07:00
Irfan Sheriff
7ee2b2a01a
am 8f87f838: Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE
...
* commit '8f87f8389866058a081e601fc0df45a3527a3150':
Define Protocol class for use with StateMachine
2011-04-28 11:48:47 -07:00
Eric Fischer
d65eff5087
am b2149f4a: (-s ours) am 1d104476: (-s ours) am a4e7353d: Import revised translations. DO NOT MERGE
...
* commit 'b2149f4a11cddba303674298ef543e76ea11475e':
Import revised translations. DO NOT MERGE
2011-04-28 11:48:43 -07:00
Conley Owens
8c7aa73225
am 4854f70c: Ignore change since file no longer exists
...
* commit '4854f70c0881ff44fabd8c261653bd90210bdc22':
Auto hide virtual keyboard
2011-04-28 11:48:25 -07:00
Stephen Hines
b9ecef2420
am 5ac02e73: (-s ours) am 697f8b33: am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
...
* commit '5ac02e73c313935b1af8a536e47f74b616986dfe':
Check setName() for null string + fix rsRand().
2011-04-28 11:48:18 -07:00
Conley Owens
ae45dfa68a
Merge "Remove duplicate '=' in exception message"
2011-04-28 11:46:39 -07:00
Irfan Sheriff
74a78c9973
Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE
2011-04-28 11:38:54 -07:00
John Reck
50bcaa2676
Merge "Use previous version if version is a codename"
2011-04-28 10:38:50 -07:00
Eric Fischer
da4f940876
am 1d104476: (-s ours) am a4e7353d: Import revised translations. DO NOT MERGE
...
* commit '1d10447631c9478fbf9574c3fde1997cc77ee6e4':
Import revised translations. DO NOT MERGE
2011-04-28 10:25:52 -07:00
Daniel Sandler
7bb5a49474
Merge "Make InputWindow.h's window types align with WindowManager.java's."
2011-04-28 10:22:49 -07:00
Conley Owens
3c4ebca573
Ignore change since file no longer exists
2011-04-28 10:10:52 -07:00
Jason Sams
aa38f3f6b9
Merge "Add dalvik code for forEach."
2011-04-27 23:00:40 -07:00
Jason Sams
19b43a6486
Merge "Start implementing control side forEach."
2011-04-27 23:00:25 -07:00
Wu-cheng Li
e960d3a874
Merge "Unhide camera focus area and metering area API."
2011-04-27 21:17:52 -07:00
Mathias Agopian
61bac329b8
Merge "Fix uninitialized variable in SurfaceTexture"
2011-04-27 19:01:01 -07:00
Mathias Agopian
cc57d6f883
Fix uninitialized variable in SurfaceTexture
...
Change-Id: Ie77cdad481fc0522ff5ea3b7e14ce94e07150793
2011-04-27 18:58:46 -07:00
Stephen Hines
adb031659d
am 697f8b33: am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
...
* commit '697f8b331bb339e4db716efbb96e2182aac40255':
Check setName() for null string + fix rsRand().
2011-04-27 17:38:53 -07:00
Stephen Hines
c0c4150d2d
am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
...
* commit '00df8e230ef797729a3618d1d0c19cda3950c922':
Check setName() for null string + fix rsRand().
2011-04-27 17:36:38 -07:00
Stephen Hines
776b2ccd77
Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
2011-04-27 17:32:40 -07:00
Dima Zavin
07ae966653
Merge changes I22d9e018,Ib0701fcc,Ibc637918,I9eb7e002,I4adcec73
...
* changes:
audioflinger: don't do work in constructor, instead do it in onFirstRef
audioflinger: enumerate all the possible audio interfaces
audio/media: convert to using the audio HAL and new audio defs
libmedia: move AudioParameter out of AudioSystem
audioflinger: move legacy audio hw/policy out to libhardware_legacy
2011-04-27 17:13:46 -07:00
Conley Owens
f90b57f612
am c4791bd6: Merge commit \'5e3562a5\' into m
...
* commit 'c4791bd65cdf2e487c87da0d863140337e5141cb':
onDetachedFromWindow is called before onAttachedToWindow
2011-04-27 17:01:49 -07:00
Conley Owens
691a24f04d
Merge commit '5e3562a5' into m
...
Conflicts:
core/java/android/view/ViewRoot.java
Change-Id: Idd1eb8309e169eae2de3838f7969606df8097b87
2011-04-27 16:58:24 -07:00
Conley Owens
cc87683217
am eedf20c2: Ignore xml change since file no longer exists
...
* commit 'eedf20c2eafde695a5ae50570a21d5449d6903ea':
Remove errant tag terminator
Normalize output of XMLtree content
2011-04-27 16:54:40 -07:00
Conley Owens
2aaa7e9bff
Ignore xml change since file no longer exists
2011-04-27 16:49:07 -07:00