OSDN Git Service
Scott Main [Thu, 23 Jun 2011 19:51:49 +0000 (12:51 -0700)]
am
db76388e: am
9a05cfe5: docs: update docs for new screen support attributes and qualifiers
* commit '
db76388e9af0019842ea2cca0b14d11f2e146d1a':
docs: update docs for new screen support attributes and qualifiers
Scott Main [Thu, 23 Jun 2011 19:26:33 +0000 (12:26 -0700)]
am
9a05cfe5: docs: update docs for new screen support attributes and qualifiers
* commit '
9a05cfe5427a6cee988333e0d65f17b9854554a3':
docs: update docs for new screen support attributes and qualifiers
Scott Main [Thu, 23 Jun 2011 16:32:58 +0000 (09:32 -0700)]
am
a602972c: am
1acd2a7f: Merge "docs: add Lenevo driver info" into honeycomb-mr2
* commit '
a602972c3fbb6a4f115b2cfe95b30fd10572fcb3':
docs: add Lenevo driver info
Scott Main [Thu, 23 Jun 2011 16:28:34 +0000 (09:28 -0700)]
am
1acd2a7f: Merge "docs: add Lenevo driver info" into honeycomb-mr2
* commit '
1acd2a7f2b263e9d8de23a0d5630d77efe370c80':
docs: add Lenevo driver info
Scott Main [Thu, 23 Jun 2011 16:18:22 +0000 (09:18 -0700)]
Merge "docs: add Lenevo driver info" into honeycomb-mr2
Robert Greenwalt [Thu, 23 Jun 2011 15:19:48 +0000 (08:19 -0700)]
am
1d6ffd73: Merge "Restrict access to protected networks." into honeycomb-LTE
* commit '
1d6ffd7339c3dfa53de19e27ca09e57233cc25ef':
Restrict access to protected networks.
Robert Greenwalt [Thu, 23 Jun 2011 15:04:48 +0000 (08:04 -0700)]
Merge "Restrict access to protected networks." into honeycomb-LTE
Scott Main [Thu, 23 Jun 2011 01:13:03 +0000 (18:13 -0700)]
am
dc0ae0cb: am
138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2
* commit '
dc0ae0cb9752c6d6150593da2dccf39abbe6b095':
docs: add info about manifest attributes that should not change
Raphael Moll [Thu, 23 Jun 2011 01:05:22 +0000 (18:05 -0700)]
am
2b5f2d01: am
e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods."
* commit '
2b5f2d01558ba338042f486c754f63873c4061fe':
Laoutlib_creator: keep original of delegate methods.
Scott Main [Thu, 23 Jun 2011 00:53:12 +0000 (17:53 -0700)]
am
138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2
* commit '
138836adc7e28e66984fdc20d22688d4da561c15':
docs: add info about manifest attributes that should not change
Scott Main [Thu, 23 Jun 2011 00:45:13 +0000 (17:45 -0700)]
Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2
Raphael Moll [Thu, 23 Jun 2011 00:44:29 +0000 (17:44 -0700)]
am
e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods."
* commit '
e2b41b0d5c8db85a60cd190c7094052db61114b2':
Laoutlib_creator: keep original of delegate methods.
Raphael Moll [Thu, 23 Jun 2011 00:11:27 +0000 (17:11 -0700)]
Merge "Laoutlib_creator: keep original of delegate methods."
Jerry J. Wang [Wed, 22 Jun 2011 22:15:31 +0000 (15:15 -0700)]
am
a5342f1a: am
850aaaef: Merge "Don\'t throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2
* commit '
a5342f1a63559e03b64b93c36b3b1e4b69d2990f':
Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)
Jerry J. Wang [Wed, 22 Jun 2011 22:11:04 +0000 (15:11 -0700)]
am
850aaaef: Merge "Don\'t throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2
* commit '
850aaaeff6df3c1c6e9cec5ae67225bb57728e0e':
Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)
Jerry J. Wang [Wed, 22 Jun 2011 22:08:25 +0000 (15:08 -0700)]
Merge "Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2
Scott Main [Wed, 22 Jun 2011 21:58:04 +0000 (14:58 -0700)]
am
e2f74aec: am
929cba13: docs: remove exclamation from media title
* commit '
e2f74aeca91ae514510f7ee1828eff43b3a2d0f7':
docs: remove exclamation from media title
Katie McCormick [Wed, 22 Jun 2011 21:49:03 +0000 (14:49 -0700)]
am
a108223f: am
d4fac2c0: Doc change: updated TOC for Bluetooth CL.
* commit '
a108223fb6a622d977c90b1097f71c867238619e':
Doc change: updated TOC for Bluetooth CL.
Scott Main [Wed, 22 Jun 2011 21:46:43 +0000 (14:46 -0700)]
am
929cba13: docs: remove exclamation from media title
* commit '
929cba1391432eb66329781c866c92a07d3f45ae':
docs: remove exclamation from media title
Katie McCormick [Wed, 22 Jun 2011 21:43:36 +0000 (14:43 -0700)]
am
d4fac2c0: Doc change: updated TOC for Bluetooth CL.
* commit '
d4fac2c0263fda4b20f253edd594cf909e61eb4e':
Doc change: updated TOC for Bluetooth CL.
Scott Main [Wed, 22 Jun 2011 21:28:53 +0000 (14:28 -0700)]
am
6f2bcc4d: am
24ef1aa6: Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2
* commit '
6f2bcc4db12ec224bad83f89f8efe92f9585caed':
docs: use new CSE to show results for all sites
Scott Main [Wed, 22 Jun 2011 21:26:10 +0000 (14:26 -0700)]
am
24ef1aa6: Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2
* commit '
24ef1aa672cc15984df7cccc5115fdda3ac85f58':
docs: use new CSE to show results for all sites
Scott Main [Wed, 22 Jun 2011 21:23:22 +0000 (14:23 -0700)]
Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2
Robert Ly [Wed, 22 Jun 2011 20:02:48 +0000 (13:02 -0700)]
am
60506b4f: am
d60e1b5b: cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
* commit '
60506b4f68a081ec7169fccee5926bc092fe2a67':
cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
Robert Ly [Wed, 22 Jun 2011 19:52:25 +0000 (12:52 -0700)]
am
d60e1b5b: cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
* commit '
d60e1b5b9132c6dba912fd5b4f5d7e12fd816244':
cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
Irfan Sheriff [Wed, 22 Jun 2011 18:21:12 +0000 (11:21 -0700)]
am
db45e0bd: am
ecce539f: Merge "Release wakelock after use" into honeycomb-mr2
* commit '
db45e0bdd02c2b9416b89999422561929feb5cc0':
Release wakelock after use
Bruno Oliveira [Wed, 22 Jun 2011 18:21:09 +0000 (11:21 -0700)]
am
0310f4da: am
f5c62362: Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2
* commit '
0310f4dad3b6ab8b050f6072050dc80374abafc2':
Rewriting "Audio and Video" section of Dev Guide.
Irfan Sheriff [Wed, 22 Jun 2011 18:21:05 +0000 (11:21 -0700)]
am
38053dad: am
41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling""
* commit '
38053dad9f8b988a162fba89545f4f7b8a09d34c':
Revert "DO NOT MERGE Revert "Fix lease duration handling""
Irfan Sheriff [Wed, 22 Jun 2011 18:19:09 +0000 (11:19 -0700)]
am
cf99765b: resolved conflicts for merge of
914ed90f to honeycomb-LTE
* commit '
cf99765b6255d73aa4fbc61d5bd78ec65fbd0370':
Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
Irfan Sheriff [Wed, 22 Jun 2011 18:10:26 +0000 (11:10 -0700)]
am
ecce539f: Merge "Release wakelock after use" into honeycomb-mr2
* commit '
ecce539f3d739fbf4b395639a485fddf51f688d6':
Release wakelock after use
Bruno Oliveira [Wed, 22 Jun 2011 18:10:24 +0000 (11:10 -0700)]
am
f5c62362: Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2
* commit '
f5c6236289e9f8a7df6af0bea78887ba2cbf406e':
Rewriting "Audio and Video" section of Dev Guide.
Irfan Sheriff [Wed, 22 Jun 2011 18:10:16 +0000 (11:10 -0700)]
am
41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling""
* commit '
41b35884ff68a62f5fc8f65dcc26342d0889113d':
Revert "DO NOT MERGE Revert "Fix lease duration handling""
Irfan Sheriff [Wed, 22 Jun 2011 18:01:16 +0000 (11:01 -0700)]
resolved conflicts for merge of
914ed90f to honeycomb-LTE
Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e
Irfan Sheriff [Wed, 22 Jun 2011 14:47:16 +0000 (07:47 -0700)]
am
5d5b73be: Merge "resolved conflicts for merge of
267a6181 to honeycomb-LTE" into honeycomb-LTE
* commit '
5d5b73be515d839d72e1cf7aeffdfdfb56d66045':
DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
Irfan Sheriff [Wed, 22 Jun 2011 14:27:39 +0000 (07:27 -0700)]
Merge "resolved conflicts for merge of
267a6181 to honeycomb-LTE" into honeycomb-LTE
Irfan Sheriff [Wed, 22 Jun 2011 05:46:51 +0000 (22:46 -0700)]
resolved conflicts for merge of
267a6181 to honeycomb-LTE
Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04
Wink Saville [Wed, 22 Jun 2011 02:37:46 +0000 (19:37 -0700)]
am
4d9261fa: Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE
* commit '
4d9261fad3e3bdfa056f377c10f2af0a6db62542':
Use dataConnectionNotInUse to decide if a DC is free.
Wink Saville [Wed, 22 Jun 2011 02:35:22 +0000 (19:35 -0700)]
am
64a09341: Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE
* commit '
64a09341d8a16212855b7cdd16fe079e25d45838':
Fix handling of unsol_data_state_change with PDP sharing scenario
Wink Saville [Wed, 22 Jun 2011 02:35:09 +0000 (19:35 -0700)]
am
aef70d3f: Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE
* commit '
aef70d3f73eec5b28e1255027f947d95a74b6ab9':
Return USIM IMSI as subscriber ID in case of CDMA-LTE mode
Wink Saville [Wed, 22 Jun 2011 02:34:54 +0000 (19:34 -0700)]
am
ac4ff895: Merge "Special retry back-off timer in call setup failure." into honeycomb-LTE
* commit '
ac4ff8958eced1c56a2e9571dd754c98eaa43108':
Special retry back-off timer in call setup failure.
Wink Saville [Wed, 22 Jun 2011 02:32:36 +0000 (19:32 -0700)]
Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE
Wink Saville [Wed, 22 Jun 2011 02:32:25 +0000 (19:32 -0700)]
Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE
Wink Saville [Wed, 22 Jun 2011 02:32:16 +0000 (19:32 -0700)]
Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE
Wink Saville [Wed, 22 Jun 2011 02:32:05 +0000 (19:32 -0700)]
Merge "Special retry back-off timer in call setup failure." into honeycomb-LTE
Irfan Sheriff [Wed, 22 Jun 2011 02:17:27 +0000 (19:17 -0700)]
Merge "Release wakelock after use" into honeycomb-mr2
Bruno Oliveira [Tue, 21 Jun 2011 23:44:56 +0000 (16:44 -0700)]
Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2
Irfan Sheriff [Tue, 21 Jun 2011 21:44:13 +0000 (14:44 -0700)]
am
885c3c11: am
bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2
* commit '
885c3c11cf1e20c456ddf681a06a4a878426a632':
DO NOT MERGE Revert "Fix lease duration handling"
Irfan Sheriff [Tue, 21 Jun 2011 21:29:42 +0000 (14:29 -0700)]
am
bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2
* commit '
bc4ddef479011e200d0273fe73c22922a85de1fe':
DO NOT MERGE Revert "Fix lease duration handling"
Irfan Sheriff [Tue, 21 Jun 2011 21:23:17 +0000 (14:23 -0700)]
Merge "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"" into honeycomb-mr2
Irfan Sheriff [Tue, 21 Jun 2011 21:23:09 +0000 (14:23 -0700)]
Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2
Jaikumar Ganesh [Tue, 21 Jun 2011 21:08:29 +0000 (14:08 -0700)]
am
9e5d0de9: (-s ours) am
b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread
* commit '
9e5d0de9a333683533a021e9733e824cac666d18':
DO NOT MERGE Incoming Bluetooth Connection requests - dialog.
Jaikumar Ganesh [Tue, 21 Jun 2011 20:24:46 +0000 (13:24 -0700)]
am
b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread
* commit '
b38fa2a0ac2bde56504929de6a3dd61ac723958e':
DO NOT MERGE Incoming Bluetooth Connection requests - dialog.
Jaikumar Ganesh [Tue, 21 Jun 2011 18:23:51 +0000 (11:23 -0700)]
Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread
Bruno Oliveira [Tue, 21 Jun 2011 18:17:12 +0000 (11:17 -0700)]
am
f1c71771: am
da61eab8: Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2
* commit '
f1c71771a2164ed0009ef9b22f9c03bd3b1af3f9':
Integrating RandomMusicPlayer sample into tree.
Bruno Oliveira [Tue, 21 Jun 2011 18:11:18 +0000 (11:11 -0700)]
am
da61eab8: Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2
* commit '
da61eab862dabe00f95c784a01c019e4f7776b23':
Integrating RandomMusicPlayer sample into tree.
Bruno Oliveira [Tue, 21 Jun 2011 18:07:47 +0000 (11:07 -0700)]
Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2
Scott Main [Tue, 21 Jun 2011 17:42:41 +0000 (10:42 -0700)]
am
a6632992: am
04295266: add api level 13 flag for docs
* commit '
a6632992135cf25b273abf7f239d7d378c936007':
add api level 13 flag for docs
Scott Main [Tue, 21 Jun 2011 17:31:09 +0000 (10:31 -0700)]
am
04295266: add api level 13 flag for docs
* commit '
04295266b03f3c588b8be6b6be409d59f757b27b':
add api level 13 flag for docs
Daniel Sandler [Tue, 21 Jun 2011 00:34:33 +0000 (17:34 -0700)]
am
e0da3f3b: am
444336dd: Merge "Fix crazy notification panel background." into honeycomb-mr2
* commit '
e0da3f3bc9aaefbf3e3737b69e91b7823f639751':
Fix crazy notification panel background.
Scott Main [Tue, 21 Jun 2011 00:32:40 +0000 (17:32 -0700)]
am
de937ac0: am
bb64fa1e: docs: fix a couple typos
* commit '
de937ac00900de7d9c3f15328778647401eb836e':
docs: fix a couple typos
Daniel Sandler [Tue, 21 Jun 2011 00:30:38 +0000 (17:30 -0700)]
am
444336dd: Merge "Fix crazy notification panel background." into honeycomb-mr2
* commit '
444336dd5f233c59e5a222d366d2498c888664b5':
Fix crazy notification panel background.
Scott Main [Tue, 21 Jun 2011 00:30:15 +0000 (17:30 -0700)]
am
20fe290e: am
beeb7762: docs: fix broken link
* commit '
20fe290e2c9fdaca94eb334187daf971796afd0d':
docs: fix broken link
Daniel Sandler [Tue, 21 Jun 2011 00:29:24 +0000 (17:29 -0700)]
Merge "Fix crazy notification panel background." into honeycomb-mr2
Scott Main [Tue, 21 Jun 2011 00:28:41 +0000 (17:28 -0700)]
am
bb64fa1e: docs: fix a couple typos
* commit '
bb64fa1e3dde8910397d159eaa300c4444b0073c':
docs: fix a couple typos
Scott Main [Tue, 21 Jun 2011 00:26:48 +0000 (17:26 -0700)]
am
beeb7762: docs: fix broken link
* commit '
beeb776209446ea45252af5bbc1fe8a463b2001b':
docs: fix broken link
Robert Greenwalt [Mon, 20 Jun 2011 23:46:20 +0000 (16:46 -0700)]
am
4906376f: Just a random fix.
* commit '
4906376f58d617083034c5899d06a73b7c1cc114':
Just a random fix.
Nick Pelly [Mon, 20 Jun 2011 22:58:40 +0000 (15:58 -0700)]
am
6f1a8edc: am
17523abb: NFC Adapter Extras API update.
* commit '
6f1a8edcc00db40a8ad300e15a23f7f1de298c3b':
NFC Adapter Extras API update.
Nick Pelly [Mon, 20 Jun 2011 22:54:07 +0000 (15:54 -0700)]
am
17523abb: NFC Adapter Extras API update.
* commit '
17523abb45b7f77f35af53e895d74be13f2314e0':
NFC Adapter Extras API update.
Conley Owens [Mon, 20 Jun 2011 20:20:49 +0000 (13:20 -0700)]
am
c1b62e3b: am
bf5adfa5: Merge "Check if we are in daylight time when calculating timezone"
* commit '
c1b62e3ba91d69dd75569b480aec55be8f808331':
Check if we are in daylight time when calculating timezone
Conley Owens [Mon, 20 Jun 2011 20:04:45 +0000 (13:04 -0700)]
am
bf5adfa5: Merge "Check if we are in daylight time when calculating timezone"
* commit '
bf5adfa5e558827fbb4771720433887bb3cbaefd':
Check if we are in daylight time when calculating timezone
Robert Greenwalt [Mon, 20 Jun 2011 19:15:24 +0000 (12:15 -0700)]
resolved conflicts for merge of
b427f0e6 to honeycomb-plus-aosp
Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713
Robert Greenwalt [Mon, 20 Jun 2011 18:47:49 +0000 (11:47 -0700)]
Merge "Fix tethering upstream determination." into honeycomb-LTE
Conley Owens [Mon, 20 Jun 2011 18:01:41 +0000 (11:01 -0700)]
Merge "Check if we are in daylight time when calculating timezone"
Robert Ly [Mon, 20 Jun 2011 16:51:08 +0000 (09:51 -0700)]
am
d1a19b10: am
c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit '
d1a19b10ef0bb0369fa7ed9a16fb8f8d6320e05f':
cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Robert Ly [Mon, 20 Jun 2011 16:50:39 +0000 (09:50 -0700)]
am
152e5f56: am
329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '
152e5f56762c9db80d2b65fda8b13e3914f05d86':
cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Robert Ly [Mon, 20 Jun 2011 16:44:59 +0000 (09:44 -0700)]
am
c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit '
c7c1ba5071456a813abbdadfdbe94287b06877e7':
cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Robert Ly [Mon, 20 Jun 2011 16:44:55 +0000 (09:44 -0700)]
am
329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '
329e0b9020f3b8cd1265c265cdf00b438960cbe1':
cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Robert Ly [Mon, 20 Jun 2011 16:37:51 +0000 (09:37 -0700)]
Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
Robert Ly [Mon, 20 Jun 2011 16:37:36 +0000 (09:37 -0700)]
Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
Jean-Baptiste Queru [Mon, 20 Jun 2011 16:14:31 +0000 (09:14 -0700)]
am
ff3ead50: (-s ours) am
e3b05d09: Merge "Tweaks for forward-compatibility"
* commit '
ff3ead5072721bfb24202ff9b041cc4291f34e21':
Tweaks for forward-compatibility
Jean-Baptiste Queru [Mon, 20 Jun 2011 16:05:07 +0000 (09:05 -0700)]
am
e3b05d09: Merge "Tweaks for forward-compatibility"
* commit '
e3b05d09163257b888c86f2a560e10c48f4cf029':
Tweaks for forward-compatibility
Jean-Baptiste Queru [Sat, 18 Jun 2011 16:45:53 +0000 (09:45 -0700)]
Merge "Tweaks for forward-compatibility"
Jean-Baptiste Queru [Sat, 18 Jun 2011 16:42:04 +0000 (09:42 -0700)]
Tweaks for forward-compatibility
Change-Id: Iec525edc186e78d5d865f82dd5b1f56263c22e86
Mathias Agopian [Fri, 17 Jun 2011 01:15:19 +0000 (18:15 -0700)]
am
48294b0d: am
e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
* commit '
48294b0d9388cff632f0e6ae5220305d342c76fb':
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
Mathias Agopian [Fri, 17 Jun 2011 01:09:56 +0000 (18:09 -0700)]
am
e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
* commit '
e7d3ee9d81de13e992c7d063ca472d480956b0c6':
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
Mathias Agopian [Fri, 17 Jun 2011 00:15:51 +0000 (17:15 -0700)]
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
Also revert all dependent changes:
This reverts commit
8e18668d14adf601cbe5973030c310ec23d88461.
This reverts commit
69b4587bfbb3e98f793959d9123340360fa233a2.
This reverts commit
a9c9a4baf24700e8817d47d8ea8da1742caea0b5.
This reverts commit
2c0042b666a969091c931614f2fc0dce2f1cfac8.
This reverts commit
f6c8206735e7e078461e5f2aef6e1a1446fdd075.
This reverts commit
24855c09173a6caaec7dcedd0c2d7ce15121d39b.
Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8
John Wang [Fri, 17 Jun 2011 00:14:28 +0000 (17:14 -0700)]
am
c6b32054: am
c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit '
c6b32054c67901b0627ad99e4bd8b15c5cc2fb90':
Revert "Do not merge. Return null id for Non-phone device."
John Wang [Thu, 16 Jun 2011 23:50:05 +0000 (16:50 -0700)]
am
c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit '
c826f92e6f90f4157afd4ed69c6907ff768a0d6b':
Revert "Do not merge. Return null id for Non-phone device."
John Wang [Thu, 16 Jun 2011 23:47:18 +0000 (16:47 -0700)]
Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
Maarten Hooft [Thu, 16 Jun 2011 22:55:14 +0000 (15:55 -0700)]
am
42781a11: am
d76baeb4: Merge "Import revised Croatian translations." into gingerbread
* commit '
42781a11ce9e346a24fbb6214f8f214845464213':
Import revised Croatian translations.
Maarten Hooft [Thu, 16 Jun 2011 22:48:55 +0000 (15:48 -0700)]
am
d76baeb4: Merge "Import revised Croatian translations." into gingerbread
* commit '
d76baeb4d836c33cc68cbb0c2e237c066f368529':
Import revised Croatian translations.
Maarten Hooft [Thu, 16 Jun 2011 22:41:20 +0000 (15:41 -0700)]
Merge "Import revised Croatian translations." into gingerbread
Dianne Hackborn [Thu, 16 Jun 2011 22:25:22 +0000 (15:25 -0700)]
am
9a73c4d3: am
2f04883f: SDK only: integrate new sample code, deprecating along the way.
* commit '
9a73c4d3a9c7ce02f80b078ca9ba5106234ecd9c':
SDK only: integrate new sample code, deprecating along the way.
Dianne Hackborn [Thu, 16 Jun 2011 22:22:10 +0000 (15:22 -0700)]
am
2f04883f: SDK only: integrate new sample code, deprecating along the way.
* commit '
2f04883ff880966d63d1aa4a1c7b05e497cfcc58':
SDK only: integrate new sample code, deprecating along the way.
Dianne Hackborn [Thu, 16 Jun 2011 21:55:01 +0000 (14:55 -0700)]
am
f1c5dbbd: am
abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2
* commit '
f1c5dbbd457bb14d3673508aaba497cdc328a1ef':
New orientation handling. Only impacts SDK (aapt dump badging).
Robert Greenwalt [Thu, 16 Jun 2011 21:50:22 +0000 (14:50 -0700)]
am
62385d5e: am
6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2
* commit '
62385d5e3183d35b22618fb91bb2dfa0de7e5fd4':
DO NOT MERGE
Dianne Hackborn [Thu, 16 Jun 2011 21:49:08 +0000 (14:49 -0700)]
am
abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2
* commit '
abd4dffc86202d48e50bd21807574fa861854dca':
New orientation handling. Only impacts SDK (aapt dump badging).
Dianne Hackborn [Thu, 16 Jun 2011 21:47:53 +0000 (14:47 -0700)]
Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2
Robert Greenwalt [Thu, 16 Jun 2011 21:44:57 +0000 (14:44 -0700)]
am
6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2
* commit '
6b93f976c0cec32be39b3a17ea8195c4ac6b8052':
DO NOT MERGE
Robert Greenwalt [Thu, 16 Jun 2011 21:40:25 +0000 (14:40 -0700)]
Merge "DO NOT MERGE" into honeycomb-mr2
OSDN Git Service
