OSDN Git Service
Wu-cheng Li [Fri, 17 Jun 2011 07:18:21 +0000 (00:18 -0700)]
Merge "Mention device policay manager in Camera.open javadoc."
Irfan Sheriff [Fri, 17 Jun 2011 03:54:04 +0000 (20:54 -0700)]
Merge "Fix network state handling"
Chia-chi Yeh [Fri, 17 Jun 2011 02:03:57 +0000 (19:03 -0700)]
Merge "VPN: make the file descriptor non-blocking by default."
Jim Miller [Fri, 17 Jun 2011 01:32:44 +0000 (18:32 -0700)]
Merge "Update GridLayout constructors to properly handle DEBUG=true"
Adam Powell [Fri, 17 Jun 2011 01:31:18 +0000 (18:31 -0700)]
Merge "Dialog-o-rama!"
Mathias Agopian [Fri, 17 Jun 2011 01:18:47 +0000 (18:18 -0700)]
am
3b916233: (-s ours) am
48294b0d: am
e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
* commit '
3b916233cbbbcc5bbc703213af5e647910956cbc':
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
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:20:06 +0000 (17:20 -0700)]
am
e21217af: (-s ours) am
c6b32054: am
c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit '
e21217af6480c45212517a68b2b6e583c4dc27c9':
Revert "Do not merge. Return null id for Non-phone device."
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."
Maarten Hooft [Fri, 17 Jun 2011 00:05:19 +0000 (17:05 -0700)]
am
769bf5d5: am
42781a11: am
d76baeb4: Merge "Import revised Croatian translations." into gingerbread
* commit '
769bf5d59ef1b6a9bce9d64d9761def735d6af65':
Import revised Croatian translations.
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
Dianne Hackborn [Thu, 16 Jun 2011 23:38:07 +0000 (16:38 -0700)]
Merge "resolved conflicts for merge of
872a1e79 to master"
Fabrice Di Meglio [Thu, 16 Jun 2011 23:20:51 +0000 (16:20 -0700)]
Merge "Update BiDiTest app for testing View padding"
Svetoslav Ganov [Thu, 16 Jun 2011 23:15:20 +0000 (16:15 -0700)]
Merge "Accessiiblity in right state upon connection of a test agent."
Romain Guy [Thu, 16 Jun 2011 23:14:06 +0000 (16:14 -0700)]
Merge "Prevent TweetDeck from crashing."
Dianne Hackborn [Thu, 16 Jun 2011 23:01:27 +0000 (16:01 -0700)]
resolved conflicts for merge of
872a1e79 to master
Change-Id: I50253b22f181729d4e748970acf1a3ad868ccd74
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.
RoboErik [Thu, 16 Jun 2011 22:44:08 +0000 (15:44 -0700)]
Merge "Adds more docs to classes in CalendarContract"
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.
Alex Sakhartchouk [Thu, 16 Jun 2011 22:15:14 +0000 (15:15 -0700)]
Merge "Adding ability to read back fbo data to renderscript"
Dianne Hackborn [Thu, 16 Jun 2011 21:57:59 +0000 (14:57 -0700)]
am
810dc598: am
f1c5dbbd: am
abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2
* commit '
810dc5980c504a89974c07fcbd28a2b5dffb47de':
New orientation handling. Only impacts SDK (aapt dump badging).
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:54:33 +0000 (14:54 -0700)]
am
9bf1a0c3: (-s ours) am
62385d5e: am
6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2
* commit '
9bf1a0c3c7e3c26df170519867c5daeee959791e':
DO NOT MERGE
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
Fabrice Di Meglio [Thu, 16 Jun 2011 21:41:50 +0000 (14:41 -0700)]
Merge "Update getLayoutDirectionFromLocale() for using ICU"
Robert Greenwalt [Thu, 16 Jun 2011 21:40:25 +0000 (14:40 -0700)]
Merge "DO NOT MERGE" into honeycomb-mr2
Chet Haase [Thu, 16 Jun 2011 21:06:36 +0000 (14:06 -0700)]
Merge "Fix crash in ViewPropertyAnimator for unparented view."
Xavier Ducrohet [Thu, 16 Jun 2011 21:04:57 +0000 (14:04 -0700)]
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
Xavier Ducrohet [Thu, 16 Jun 2011 21:04:18 +0000 (14:04 -0700)]
am
0be8522b: am
d1abd94f: am
04ce8111: Bring in more layout lib changes from hc-mr1.
* commit '
0be8522b430aca8d90023d7c7e5ef510aa48adc7':
Bring in more layout lib changes from hc-mr1.
Xavier Ducrohet [Thu, 16 Jun 2011 20:55:30 +0000 (13:55 -0700)]
am
d1abd94f: am
04ce8111: Bring in more layout lib changes from hc-mr1.
* commit '
d1abd94f57c0162186c57aea98790e8fa281e0a2':
Bring in more layout lib changes from hc-mr1.
RoboErik [Thu, 16 Jun 2011 20:51:16 +0000 (13:51 -0700)]
Merge "Add DroidDocs to Events class"
Xavier Ducrohet [Thu, 16 Jun 2011 20:39:31 +0000 (13:39 -0700)]
am
04ce8111: Bring in more layout lib changes from hc-mr1.
* commit '
04ce81113107d2bfa0b8248b13145b4cf24cb943':
Bring in more layout lib changes from hc-mr1.
Jeff Sharkey [Thu, 16 Jun 2011 20:39:02 +0000 (13:39 -0700)]
Merge "DownloadManager flags for network policy."
John Reck [Thu, 16 Jun 2011 20:21:52 +0000 (13:21 -0700)]
Merge "Inline SeekBarPreference"
Robert Greenwalt [Thu, 16 Jun 2011 19:50:46 +0000 (12:50 -0700)]
am
241b65ac: am
5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
* commit '
241b65aca93e263f0869c5bec4ad1dbda0dec6db':
Reset connections AFTER we take down the network.
John Wang [Thu, 16 Jun 2011 19:49:17 +0000 (12:49 -0700)]
am
03cbb58e: am
ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE
* commit '
03cbb58e2418dc22ae18a8648404382da4ee46e8':
Support SIM permanently disabled state.
Robert Greenwalt [Thu, 16 Jun 2011 19:42:15 +0000 (12:42 -0700)]
am
5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
* commit '
5f3505121b761dbd3bba62d1603fbab49de139b9':
Reset connections AFTER we take down the network.
Mathias Agopian [Thu, 16 Jun 2011 19:41:00 +0000 (12:41 -0700)]
am
35e6d686: (-s ours) am
0887b8c2: am
8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
* commit '
35e6d6867c63ad254e95325206aa7a927edd6797':
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
Mathias Agopian [Thu, 16 Jun 2011 19:40:44 +0000 (12:40 -0700)]
am
552bd670: (-s ours) am
d5244e0a: am
52a43990: Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
* commit '
552bd670071b519d97124621a3c11dc98062c12b':
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
Mathias Agopian [Thu, 16 Jun 2011 19:39:48 +0000 (12:39 -0700)]
am
85c14352: (-s ours) am
7ecdeb6e: am
d20d72d1: Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
* commit '
85c14352a4f8946a6908eac140936080536fa575':
revert surfaceflinger leak fix as it uncovered a crasher on xoom
John Wang [Thu, 16 Jun 2011 19:34:34 +0000 (12:34 -0700)]
am
ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE
* commit '
ff42c04d15e000f6295e796e154cc60c54aa078b':
Support SIM permanently disabled state.
Robert Greenwalt [Thu, 16 Jun 2011 18:34:03 +0000 (11:34 -0700)]
Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
John Wang [Thu, 16 Jun 2011 18:22:53 +0000 (11:22 -0700)]
Merge "Support SIM permanently disabled state." into honeycomb-LTE
Philip Milne [Thu, 16 Jun 2011 18:18:42 +0000 (11:18 -0700)]
Merge "Future-proofing: change Alignment interface to abstract class and add a parameter for measurementType."
Chia-chi Yeh [Thu, 16 Jun 2011 17:34:34 +0000 (10:34 -0700)]
Merge "VPN: migrate from generic Bundle to our own Parcelable VpnConfig."
Gloria Wang [Thu, 16 Jun 2011 17:23:04 +0000 (10:23 -0700)]
Merge "-Fix some typo -Remove one unnecessary memory allocation"
Jean-Baptiste Queru [Thu, 16 Jun 2011 17:21:18 +0000 (10:21 -0700)]
Merge
f28f1de3 - regen current.txt
Change-Id: I7875932a0634542251f53855b4e8620a089de05f
Eric Fischer [Thu, 16 Jun 2011 16:31:53 +0000 (09:31 -0700)]
am
a5608e3a: (-s ours) am
c0e84cf3: am
5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
a5608e3a67a86f55e8c5ce971934f32c398f2525':
Import revised translations. DO NOT MERGE
Irfan Sheriff [Thu, 16 Jun 2011 16:31:21 +0000 (09:31 -0700)]
am
030a8c65: am
a4644307: (-s ours) am
df1734e3: Fix lease duration handling
* commit '
030a8c65dff975e19b78d957dceee61e73451ea7':
Fix lease duration handling
Narayan Kamath [Thu, 16 Jun 2011 10:05:07 +0000 (03:05 -0700)]
Merge "Don't enforce defaults any more in the TextToSpeech API."
Kenny Root [Thu, 16 Jun 2011 09:30:37 +0000 (02:30 -0700)]
Merge "Fix crash determining direction of invalid locale"
Narayan Kamath [Thu, 16 Jun 2011 08:58:06 +0000 (01:58 -0700)]
Merge "Increase the visibility of SynthesisRequest"
Wu-cheng Li [Thu, 16 Jun 2011 08:05:43 +0000 (01:05 -0700)]
Merge "Allow camera to be disabled via Device Policy Manager"
Kenny Root [Thu, 16 Jun 2011 06:10:30 +0000 (23:10 -0700)]
Merge "Use rand() for MinGW"
Mathias Agopian [Thu, 16 Jun 2011 05:42:52 +0000 (22:42 -0700)]
am
0887b8c2: am
8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
* commit '
0887b8c2e583e682cd2c1bc909cb3fdbec704004':
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
Mathias Agopian [Thu, 16 Jun 2011 05:40:07 +0000 (22:40 -0700)]
am
8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
* commit '
8e18668d14adf601cbe5973030c310ec23d88461':
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
Mathias Agopian [Thu, 16 Jun 2011 05:12:32 +0000 (22:12 -0700)]
am
d5244e0a: am
52a43990: Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
* commit '
d5244e0a88ed2f843651aa5ffdc71a45c968e0f3':
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
Mathias Agopian [Thu, 16 Jun 2011 05:09:39 +0000 (22:09 -0700)]
am
52a43990: Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
* commit '
52a43990880b27808bcf562afcc4209d34728e6e':
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
Kenny Root [Thu, 16 Jun 2011 03:41:15 +0000 (20:41 -0700)]
Use rand() for MinGW
The version of MinGW we use doesn't have nrand48() which is really lame,
but we need to use libutils in the Windows SDK.
Change-Id: If854c03dbf02bc29e79f49e4539f08c2bf057517
Mathias Agopian [Thu, 16 Jun 2011 03:42:47 +0000 (20:42 -0700)]
revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
This reverts commit
52a43990880b27808bcf562afcc4209d34728e6e.
Change-Id: I1856a48f863b051395b8091ddfd1e01292fa1b1e
Mathias Agopian [Thu, 16 Jun 2011 03:41:24 +0000 (20:41 -0700)]
Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
This reverts commit
af6edba59e250adbdfa5b3c3be134f70d8c38a16.
Change-Id: I7793d3ca8a4d20a2b188364f47854328ab5f586d
Mathias Agopian [Thu, 16 Jun 2011 03:21:31 +0000 (20:21 -0700)]
am
7ecdeb6e: am
d20d72d1: Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
* commit '
7ecdeb6e548ff71d4f70b343e30136e89eaa3e33':
revert surfaceflinger leak fix as it uncovered a crasher on xoom
Mathias Agopian [Thu, 16 Jun 2011 03:18:24 +0000 (20:18 -0700)]
am
d20d72d1: Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
* commit '
d20d72d193ab0d7f33c839d8bf9573b55abfebdc':
revert surfaceflinger leak fix as it uncovered a crasher on xoom
Mathias Agopian [Thu, 16 Jun 2011 03:16:15 +0000 (20:16 -0700)]
Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2
Mathias Agopian [Thu, 16 Jun 2011 02:20:52 +0000 (19:20 -0700)]
revert surfaceflinger leak fix as it uncovered a crasher on xoom
Bug:
4600244
Change-Id: Ia68ebf0f243a051ff6a21b3863e3e5d259bbf7ac
Yu Shan Emily Lau [Thu, 16 Jun 2011 01:47:55 +0000 (18:47 -0700)]
Merge "Add new open source test contents. Removed old test files. Updated the tests with new test contents."
Romain Guy [Thu, 16 Jun 2011 00:58:13 +0000 (17:58 -0700)]
Merge "Correctly register native methods."
Xia Wang [Thu, 16 Jun 2011 00:53:02 +0000 (17:53 -0700)]
Merge "Add opengl bench mark test: -- display icons with livewallpaper background (galaxy)"
Fabrice Di Meglio [Thu, 16 Jun 2011 00:49:24 +0000 (17:49 -0700)]
Merge "Introduce LocalUtil and getLayoutDirectionFromLocale() now use likelySubtags"
Dianne Hackborn [Thu, 16 Jun 2011 00:47:08 +0000 (17:47 -0700)]
Merge "Fix to clear calling identity when binding a widget."
Romain Guy [Thu, 16 Jun 2011 00:45:20 +0000 (17:45 -0700)]
Merge "Forgot to ammend the change"
Svetoslav Ganov [Thu, 16 Jun 2011 00:30:10 +0000 (17:30 -0700)]
Merge "Invisible views should not be visible to accessibility services (interrogation)"
Xia Wang [Thu, 16 Jun 2011 00:25:23 +0000 (17:25 -0700)]
Merge "Fill in opengl benchmark test: - display a list view"
Dianne Hackborn [Thu, 16 Jun 2011 00:12:45 +0000 (17:12 -0700)]
am
413b53b5: am
70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2
* commit '
413b53b57d62b60e98cfe5b9359551315e7cb3a7':
We must keep up with the Joneses.
Dianne Hackborn [Thu, 16 Jun 2011 00:10:33 +0000 (17:10 -0700)]
am
70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2
* commit '
70921d615496c5be8a19cbd1454378bb7d0201f3':
We must keep up with the Joneses.
Dianne Hackborn [Thu, 16 Jun 2011 00:08:04 +0000 (17:08 -0700)]
Merge "We must keep up with the Joneses." into honeycomb-mr2
Chia-chi Yeh [Thu, 16 Jun 2011 00:07:09 +0000 (17:07 -0700)]
Merge "VpnDialogs: use IConnectivityManager instead or ConnectivityManager."
Dave Santoro [Wed, 15 Jun 2011 23:56:45 +0000 (16:56 -0700)]
Merge "Added profile string descriptions and limits."
John Wang [Wed, 15 Jun 2011 23:51:41 +0000 (16:51 -0700)]
Merge "Don't clean up operator properties in RuimRecords."
Michael Jurka [Wed, 15 Jun 2011 23:51:22 +0000 (16:51 -0700)]
Merge "Port recent apps from tablet to phone"
Romain Guy [Wed, 15 Jun 2011 23:49:57 +0000 (16:49 -0700)]
Merge "Properly refcount SurfaceTexture in the JNI layer."
Eric Fischer [Wed, 15 Jun 2011 23:47:08 +0000 (16:47 -0700)]
am
c0e84cf3: am
5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
c0e84cf3210fc6b5929d024fafbe75f08167c44e':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 15 Jun 2011 23:41:44 +0000 (16:41 -0700)]
am
5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
5e451faa0c22e943fb76d812f699d51fa11c5495':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 15 Jun 2011 23:38:43 +0000 (16:38 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
Irfan Sheriff [Wed, 15 Jun 2011 23:35:20 +0000 (16:35 -0700)]
am
a4644307: (-s ours) am
df1734e3: Fix lease duration handling
* commit '
a464430762bad8039a598ce9af71f962d01f8eba':
Fix lease duration handling
Irfan Sheriff [Wed, 15 Jun 2011 23:29:02 +0000 (16:29 -0700)]
am
df1734e3: Fix lease duration handling
* commit '
df1734e3f57646df1fa96275cbb65bb91ac9d2ac':
Fix lease duration handling
Xavier Ducrohet [Wed, 15 Jun 2011 22:46:30 +0000 (15:46 -0700)]
Merge "Fix changed native method delegates in layoutlib for ICS."
The Android Open Source Project [Wed, 15 Jun 2011 22:09:49 +0000 (15:09 -0700)]
Reconcile with gingerbread-release
Change-Id: I500f9a10cdfb891919b1e5618a42330ba00fcfb6
Justin Ho [Wed, 15 Jun 2011 22:01:42 +0000 (15:01 -0700)]
am
40fc6e0d: am
c407ef22: am
f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2
* commit '
40fc6e0de578198c9cc5d9a493cb7db77bc938b8':
Updated art for compat mode dialog.
Justin Ho [Wed, 15 Jun 2011 21:58:56 +0000 (14:58 -0700)]
am
c407ef22: am
f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2
* commit '
c407ef22222f8f7e6f82abd081ecb65149336f99':
Updated art for compat mode dialog.
Justin Ho [Wed, 15 Jun 2011 21:56:03 +0000 (14:56 -0700)]
am
f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2
* commit '
f409604122f959653fb789e9133e94a51e369693':
Updated art for compat mode dialog.