OSDN Git Service
Brad Fitzpatrick [Mon, 7 Feb 2011 18:04:54 +0000 (10:04 -0800)]
am
9204644d: Merge "Fix a race condition in NativeDaemonConnector"
* commit '
9204644d9e8fc2a3d05ff386b14b349f7a117694':
Fix a race condition in NativeDaemonConnector
Brad Fitzpatrick [Mon, 7 Feb 2011 17:55:34 +0000 (09:55 -0800)]
Merge "Fix a race condition in NativeDaemonConnector"
anga [Tue, 1 Feb 2011 13:10:25 +0000 (14:10 +0100)]
Fix a race condition in NativeDaemonConnector
Fixes a race between the onDaemonConnected callback and setting the
mOutputStream in NativeDaemonConnector.
MountService connects to vold using the NativeDaemonConnector.
Throws a “NativeDaemonConnectorException: No output stream!”
when the onDaemonConnected callback in MountService calls the doListCommand.
Change-Id: Ib895bab37f7df680e4362df6366198c0a673c5e9
Dianne Hackborn [Mon, 7 Feb 2011 15:33:38 +0000 (07:33 -0800)]
am
bb2e1ef8: Merge "Fixing possible race condition."
* commit '
bb2e1ef87fe4c5123340035766c759155e6bb90c':
Fixing possible race condition.
Dianne Hackborn [Sun, 6 Feb 2011 17:06:35 +0000 (09:06 -0800)]
Merge "Fixing possible race condition."
Kenny Root [Sat, 5 Feb 2011 00:01:13 +0000 (16:01 -0800)]
am
c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
* commit '
c94a99987d8a49ea599c22ffad0e61db591963e0':
JPtextinput: Dont break emoji characters when cutting strings.
Kenny Root [Fri, 4 Feb 2011 23:42:14 +0000 (15:42 -0800)]
Merge "JPtextinput: Dont break emoji characters when cutting strings."
Brad Fitzpatrick [Fri, 4 Feb 2011 18:27:54 +0000 (10:27 -0800)]
am
b083d3b8: Merge "Initialize resampling buffer per track."
* commit '
b083d3b816378ef3b9dceb33b2c2e20510b2632b':
Initialize resampling buffer per track.
Brad Fitzpatrick [Fri, 4 Feb 2011 18:19:06 +0000 (10:19 -0800)]
Merge "Initialize resampling buffer per track."
Yuuhi Yamaguchi [Fri, 4 Feb 2011 14:24:34 +0000 (15:24 +0100)]
Initialize resampling buffer per track.
When resampling too short sound, AudioMixer uses previous
tracks buffer. So we re-initialize the temporary buffer per
loop to avoid it.
Change-Id: I55a59a3b14faa8445e09c450478fe79cef704760
Jean-Baptiste Queru [Thu, 3 Feb 2011 23:24:24 +0000 (15:24 -0800)]
Jean-Baptiste Queru [Thu, 3 Feb 2011 22:25:27 +0000 (14:25 -0800)]
Merge from gingerbread
Change-Id: I6b895012db6b96666dc3257b1f2e430925981188
Jean-Baptiste Queru [Thu, 3 Feb 2011 22:09:34 +0000 (14:09 -0800)]
am
8444023f: Merge from open-source gingerbread
* commit '
8444023f351b22816f6827d3314ff81b3533e3d9':
Fix the Multi-page SMS sending error to several receipents
Jean-Baptiste Queru [Thu, 3 Feb 2011 22:05:14 +0000 (14:05 -0800)]
Merge from open-source gingerbread
Change-Id: I19c4ba36cf4f2ef518b55768360b0bff1a92a5ab
Jean-Baptiste Queru [Thu, 3 Feb 2011 22:02:59 +0000 (14:02 -0800)]
Merge "Fix the Multi-page SMS sending error to several receipents" into gingerbread
Sang-Jun Park [Thu, 3 Feb 2011 21:24:25 +0000 (06:24 +0900)]
Fix the Multi-page SMS sending error to several receipents
Change-Id: Iefde94b638413e3c1761f17c3065b20a044e5958
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
Jean-Baptiste Queru [Thu, 3 Feb 2011 21:32:08 +0000 (13:32 -0800)]
Jean-Baptiste Queru [Thu, 3 Feb 2011 21:28:51 +0000 (13:28 -0800)]
am
4b8ad9ef: Merge from gingerbread
* commit '
4b8ad9effd95508e9966b8a3a355f0a948558ae2':
Fix delivery report error with PENDING status in SMS
Jean-Baptiste Queru [Thu, 3 Feb 2011 21:17:49 +0000 (13:17 -0800)]
Merge from gingerbread
Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c
Jean-Baptiste Queru [Thu, 3 Feb 2011 21:03:36 +0000 (13:03 -0800)]
Merge
ee4c17ee from gingerbread
Change-Id: Ide109e517fb7610d60f31ba6aa99fe665b59d690
Jean-Baptiste Queru [Thu, 3 Feb 2011 20:41:49 +0000 (12:41 -0800)]
Merge from open-source gingerbread
Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
Jean-Baptiste Queru [Thu, 3 Feb 2011 20:17:47 +0000 (12:17 -0800)]
Merge "Fix delivery report error with PENDING status in SMS" into gingerbread
Scott Main [Thu, 3 Feb 2011 02:08:51 +0000 (18:08 -0800)]
am
ca69a634: fix broken links, update the dev guide intro, and update sitemap file
* commit '
ca69a6340610bfd7e830ff9be64a74085aea037c':
fix broken links, update the dev guide intro, and update sitemap file
Scott Main [Thu, 3 Feb 2011 01:43:24 +0000 (17:43 -0800)]
fix broken links, update the dev guide intro, and update sitemap file
Change-Id: Icf0c7772901f742c36ba417e07cc5e299f72849a
Scott Main [Thu, 3 Feb 2011 00:44:55 +0000 (16:44 -0800)]
am
94a6c689: Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread
* commit '
94a6c689acb03ba01546a10933699bde22bb4a4c':
wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed
Scott Main [Thu, 3 Feb 2011 00:41:29 +0000 (16:41 -0800)]
am
4add7f3f: cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
* commit '
4add7f3ffcebe1564d1e492194817afaf107ac16':
cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
Scott Main [Thu, 3 Feb 2011 00:38:25 +0000 (16:38 -0800)]
Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread
Scott Main [Fri, 28 Jan 2011 17:34:27 +0000 (09:34 -0800)]
cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2
update OEM driver list with new fujitsu and kyocera
Change-Id: Ice11a179fe6a4eb220509fc784ac6f6af5a2fa5e
Scott Main [Wed, 2 Feb 2011 23:57:03 +0000 (15:57 -0800)]
wholesale manual merge of docs from gingerbread-docs to gingerbread
includes misc changes that occured for preview sdk and shortly after
plus misc older stuff that got missed
Change-Id: Ibb8490b2c6bae2d9df15326c7ffbcf83b638acc6
Bill Gruber [Wed, 2 Feb 2011 23:46:52 +0000 (15:46 -0800)]
am
df71cabb: cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
* commit '
df71cabbc2f670a4acea91e04f54990a472a56e9':
cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
Scott Main [Wed, 2 Feb 2011 23:44:29 +0000 (15:44 -0800)]
am
2458f2a1: cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
* commit '
2458f2a1ccf13a9f33c21d8aff260baefac9edb8':
cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
Bill Gruber [Wed, 2 Feb 2011 07:01:16 +0000 (23:01 -0800)]
cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83
Initial posting of in-app billing docs
Change-Id: I26adb5480e556d8f914a3443f1b75c220742245d
Scott Main [Wed, 2 Feb 2011 19:24:56 +0000 (11:24 -0800)]
cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821
add notice about large screen devices and the "mobile" string in user agent
Change-Id: I2e6a3f2c4fced2cf06bb996c1135c042682cdf8f
Scott Main [Wed, 2 Feb 2011 23:16:13 +0000 (15:16 -0800)]
am
0c1a4d3b: cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
* commit '
0c1a4d3b51337784583ef39378ca8796bb8b0992':
cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
Scott Main [Wed, 2 Feb 2011 23:08:22 +0000 (15:08 -0800)]
cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680
fix market link on homepage
Change-Id: I1d617c9737e6a3293372bbe70aff0cfa88dfba8c
Irfan Sheriff [Wed, 2 Feb 2011 22:23:10 +0000 (14:23 -0800)]
resolved conflicts for merge of
0a4b3fd9 to gingerbread-plus-aosp
Change-Id: I294e6e843ae028377d19c1180e0d5e9aef52897c
Irfan Sheriff [Wed, 2 Feb 2011 20:34:08 +0000 (12:34 -0800)]
two digit number handling in croatia and serbia
If users dial 92-96, dial them normally and not treat
as USSD
Change-Id: If3b6cb37b7ec0ff99d76cb10cba53368094a0b5d
Signed-off-by: sj2202.park@samsung.com
Jean-Baptiste Queru [Wed, 2 Feb 2011 17:56:30 +0000 (09:56 -0800)]
Jean-Baptiste Queru [Wed, 2 Feb 2011 17:52:24 +0000 (09:52 -0800)]
am
8226140c: Merge from gingerbread
* commit '
8226140ccadbc8e0bdd093f8bab0a5292b9224e3':
fix for supporting 3 digits MNC code
Jean-Baptiste Queru [Wed, 2 Feb 2011 17:48:52 +0000 (09:48 -0800)]
am
155b0ee0: Merge from open-source gingerbread
* commit '
155b0ee0498cf863091f3f83a752eaaedf1257f8':
fix for supporting 3 digits MNC code
Jean-Baptiste Queru [Wed, 2 Feb 2011 17:47:36 +0000 (09:47 -0800)]
Merge from gingerbread
Change-Id: Ifb3d42aa0f3772ca545f739df347eeb0ca7f58dd
Jean-Baptiste Queru [Wed, 2 Feb 2011 17:45:19 +0000 (09:45 -0800)]
Merge from open-source gingerbread
Change-Id: Iec6167bec8423e39dde053f23969c1c76e10a461
Jean-Baptiste Queru [Wed, 2 Feb 2011 17:44:16 +0000 (09:44 -0800)]
Merge "fix for supporting 3 digits MNC code" into gingerbread
Eric Laurent [Wed, 2 Feb 2011 16:28:25 +0000 (08:28 -0800)]
am
3d4069a2: Allow TTY mode for GSM Phones
* commit '
3d4069a2e0c1c23244ead88a177ec06a2ef7a7d1':
Allow TTY mode for GSM Phones
Sang-Jun Park [Wed, 2 Feb 2011 10:12:31 +0000 (19:12 +0900)]
fix for supporting 3 digits MNC code
Default Android MNC value has a 2 digit but it should be supported a 3 digit
MNC in India. (should be supported both 2 and 3 digits MNC)
Change-Id: I69373d196b29bccd06653841f24cbfe3886834fb
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
Eric Laurent [Tue, 25 Jan 2011 19:51:46 +0000 (11:51 -0800)]
Allow TTY mode for GSM Phones
TTY mode should not be restricted to CDMA phones as some GSM carriers
support it.
TTY support is enabled by overlaying the tty_enabled boolean property
in packages/apps/Phones/res/values/config.xml
Also corrected wrong comments on TTY methods.
Change-Id: I48dbc2be51c3dcdaedc1838b85134edc7012be3c
Jean-Baptiste Queru [Tue, 1 Feb 2011 21:12:04 +0000 (13:12 -0800)]
am
dbf09fee: am
eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"
* commit '
dbf09feee0ba7210dadebbbb4cf7e7248f4ea634':
Don't crash zygote if webcore fails to load
Jean-Baptiste Queru [Tue, 1 Feb 2011 21:02:19 +0000 (13:02 -0800)]
am
eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"
* commit '
eb17d6f51a9776f02be84859b8980a6317abd27c':
Don't crash zygote if webcore fails to load
Jean-Baptiste Queru [Tue, 1 Feb 2011 20:41:55 +0000 (12:41 -0800)]
Merge "Don't crash zygote if webcore fails to load"
Nick Pelly [Tue, 1 Feb 2011 18:10:42 +0000 (10:10 -0800)]
am
cbf0983e: Merge "Final final final Gingerbread MR API changes." into gingerbread
* commit '
cbf0983ec97879026e87fa97ff0b5c8786bfc8f8':
Final final final Gingerbread MR API changes.
Sang-Jun Park [Mon, 31 Jan 2011 09:44:37 +0000 (18:44 +0900)]
Fix delivery report error with PENDING status in SMS
1. According to TS 23.040, TP-Status values is changed properly.
2. When processing Status Report, it should be checked whether tpStatus is PENDING or FAILED.
Change-Id: I91c315cfb363f3e4b936c6b6b1a01083687a580f
Nick Pelly [Tue, 1 Feb 2011 17:39:31 +0000 (09:39 -0800)]
Merge "Final final final Gingerbread MR API changes." into gingerbread
Nick Pelly [Tue, 1 Feb 2011 07:27:37 +0000 (23:27 -0800)]
Final final final Gingerbread MR API changes.
This is it. I promise.
ACTION_TECHNOLOGY_DISCOVERED -> ACTION_TECH_DISCOVERED
This was missed in our technology->tech rename.
Hide TagTechnology.reconnect()
This is used to reset any per-connection state in a tag, by reconnecting
to it. The first problem is that it belongs on Tag, not TagTechnology. The
second problem is that it may become redundant once we add Tag.rediscover()
which will also reconnect to the tag, and will also return a new Tag with
newly created technologies enumerated. And the third and most significant
problem is that you can already achieve the same result by just calling
close() followed by connect().
Hide Tag.createMockTag()
This API cannot be used reliably. First it requires using int[] for the
technology list, but those int constants are now hidden. Second it requires
knowledge of the extras parcel used to fill technology specific data - also
not public.
Introduce TagTechnology.isConnected()
Every child class already impelmented this, and given that connect() and
close() are defined on the interface, then isConnected() should be there
too.
Modify Ndef.getType to return a string (not int)
Allows more flexibility in adding new NDEF types. Current public strings are
org.nfcforum.ndef.type1
org.nfcforum.ndef.type2
org.nfcforum.ndef.type3
org.nfcforum.ndef.type4
com.nxp.ndef.mifareclassic
Add NdefFormatable.formatReadOnly()
This allows you to make the tag read-only at the same time as performing
format and write. It is important because we currently don't have any
public API to re-enumerate a tag technology list after making a tag
NDEF compatible, so you can't perform the format as a seperate step
without physically removing the tag from field and returning it.
Modify Readonly -> ReadOnly
Make Tag class final
Change-Id: Icf306aeb37b936ca3007e4868e99b6baceac4aff
Jozef BABJAK [Thu, 20 Jan 2011 07:09:25 +0000 (08:09 +0100)]
Fixing possible race condition.
That return statement is effectively a reading of asynchronously modified
field. The reading and writing is elsewhere protected by locking on thread
instance, except this one occurence. Moving 'return' statement into
synchronized block ensures that it reads updated value.
Don't be afraid of deadlock - wait() releases the lock and acquires it
back when notified.
Change-Id: I940c24c04a1a2d4508d14d11b6174ff4fb2ab7d5
Dianne Hackborn [Tue, 1 Feb 2011 01:55:11 +0000 (17:55 -0800)]
am
7a7ed2b2: Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
* commit '
7a7ed2b21233480d63a1f6b3830e3b0c1c6a3298':
Do not check features in PackageManagerService DO NOT MERGE
Dianne Hackborn [Tue, 1 Feb 2011 01:41:54 +0000 (17:41 -0800)]
Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
Kenny Root [Tue, 1 Feb 2011 00:25:25 +0000 (16:25 -0800)]
Do not check features in PackageManagerService DO NOT MERGE
PackageManagerService shouldn't check features that a package declares
that it uses because this will cause problems in the future when we add
more features that older phones didn't explicitly declare. We must rely
on markets to know about phones and filter them for us to avoid this
situation.
Bug:
3409434
Change-Id: I0d51b2de33d8110edc6824af4b5b8c901f96077f
Eric Fischer [Tue, 1 Feb 2011 00:18:27 +0000 (16:18 -0800)]
am
a019d15b: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
a019d15b667a72d7cb29afc7f153d5c517abcb76':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 1 Feb 2011 00:08:52 +0000 (16:08 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Jean-Baptiste Queru [Mon, 31 Jan 2011 23:43:19 +0000 (15:43 -0800)]
Don't crash zygote if webcore fails to load
Change-Id: I88271fb62c0cc7c6d768009a713f20d9dfbfb5eb
Dianne Hackborn [Mon, 31 Jan 2011 22:36:02 +0000 (14:36 -0800)]
am
e6c6b760: DO NOT MERGE Fix issue #
3408542: "resizeable" attribute required to get out of compat mode
* commit '
e6c6b760eb0c1068fdfa656007ec27e482313b58':
DO NOT MERGE Fix issue #
3408542: "resizeable" attribute required to get out of compat mode
Dianne Hackborn [Mon, 31 Jan 2011 20:34:56 +0000 (12:34 -0800)]
DO NOT MERGE Fix issue #
3408542: "resizeable" attribute required to get out of compat mode
The "resizeable" attribute of supports-screens was never well documented,
so many apps don't set it. Assuming that if they are explicitly saying
they support large or xlarge screens then they are also implying that they
are resizeable.
Change-Id: Ibce45539d8910dfddb4f548da5464b31ac4a3a89
Eric Fischer [Mon, 31 Jan 2011 20:17:36 +0000 (12:17 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I07d18c234d74184a6bc83894a3e874ce1ae782da
Jean-Baptiste Queru [Mon, 31 Jan 2011 20:03:59 +0000 (12:03 -0800)]
Jean-Baptiste Queru [Mon, 31 Jan 2011 19:55:40 +0000 (11:55 -0800)]
Jean-Baptiste Queru [Mon, 31 Jan 2011 19:32:33 +0000 (11:32 -0800)]
Merge "stubs"
Jeff Hamilton [Mon, 31 Jan 2011 18:05:13 +0000 (10:05 -0800)]
am
113834c5: Commit the final API for level 10.
* commit '
113834c5ab30bfc554202d0f3144a662d77f2484':
Commit the final API for level 10.
Jeff Hamilton [Mon, 31 Jan 2011 17:46:29 +0000 (11:46 -0600)]
Commit the final API for level 10.
Change-Id: I56140f79ff599c1a9d03c0f53d700df402234bf1
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:26:18 +0000 (16:26 -0800)]
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:19:59 +0000 (16:19 -0800)]
am
e88fa50b: Merge from open-source gingerbread
* commit '
e88fa50be8d6709ef58b7aeb01c5efa059bcac2e':
fix failing thread object run
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:07:25 +0000 (16:07 -0800)]
am
25503f1c: Merge from gingerbread
* commit '
25503f1c9f0b5f718052b71dc5b21d1c8576d015':
fix failing thread object run
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:35:06 +0000 (15:35 -0800)]
Merge from gingerbread
Change-Id: I017330e0232b317b8bb54e19ab05874b18c83246
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:29:52 +0000 (15:29 -0800)]
Merge from open-source gingerbread
Change-Id: I56f2ed37187796807fbf0de15274a85164f9432c
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:17:33 +0000 (15:17 -0800)]
Merge "fix failing thread object run" into gingerbread
Dianne Hackborn [Sun, 30 Jan 2011 07:04:50 +0000 (23:04 -0800)]
am
a30063d8: am
25eb0464: Merge "Normalize output from aapt d"
* commit '
a30063d80c08434ac3c7316f338c6d54110449ab':
Normalize output from aapt d
Dianne Hackborn [Sun, 30 Jan 2011 07:01:20 +0000 (23:01 -0800)]
am
25eb0464: Merge "Normalize output from aapt d"
* commit '
25eb04642cb5a72f59a274bbfc92f4f65c6c343e':
Normalize output from aapt d
Dianne Hackborn [Sun, 30 Jan 2011 06:53:20 +0000 (22:53 -0800)]
Merge "Normalize output from aapt d"
Dianne Hackborn [Sun, 30 Jan 2011 06:30:57 +0000 (22:30 -0800)]
am
c12cdda9: Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
* commit '
c12cdda949e6b916dd9e6fa4b30ab8b0d1898faa':
DO NOT MERGE: Fix screen size compatibility mode.
Dianne Hackborn [Sun, 30 Jan 2011 06:20:05 +0000 (22:20 -0800)]
Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
Dianne Hackborn [Sat, 29 Jan 2011 21:22:02 +0000 (13:22 -0800)]
DO NOT MERGE: Fix screen size compatibility mode.
Cherry-picked from HC.
Change-Id: Icce2a64f187a56deefcddc3d9b22fa94effce431
Dianne Hackborn [Sat, 29 Jan 2011 23:05:30 +0000 (15:05 -0800)]
am
2107757d: am
bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"
* commit '
2107757dde0b3159119edcc9084fcb9a87985e88':
Make AaptGroupEntry::getMncName accept mnc00
Dianne Hackborn [Sat, 29 Jan 2011 22:59:02 +0000 (14:59 -0800)]
am
bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"
* commit '
bbb5a5ce1922a168335811b177cd7341350c15cc':
Make AaptGroupEntry::getMncName accept mnc00
Jean-Baptiste Queru [Sat, 29 Jan 2011 22:43:33 +0000 (14:43 -0800)]
am
1358b6a4: Tweak to make merges easier
* commit '
1358b6a4fb68e81058aa938e46b125350bdf0fff':
Tweak to make merges easier
Dianne Hackborn [Sat, 29 Jan 2011 22:38:48 +0000 (14:38 -0800)]
Merge "Make AaptGroupEntry::getMncName accept mnc00"
Jean-Baptiste Queru [Sat, 29 Jan 2011 20:53:52 +0000 (12:53 -0800)]
Tweak to make merges easier
Bug:
3364311
Change-Id: Idec05206615de524a3b61d8579d9f2b462b541cd
Jean-Baptiste Queru [Sat, 29 Jan 2011 16:00:52 +0000 (08:00 -0800)]
am
87d19759: Delete browerplugin tests - do not merge
* commit '
87d197597c9130b10ba9d67f17ed81db26e35cd8':
Delete browerplugin tests - do not merge
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:58:36 +0000 (07:58 -0800)]
am
d4c8cec0: am
9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge"
* commit '
d4c8cec094dbf7bcfa3f31bedae15e5c65b13e94':
Delete browerplugin tests - do not merge
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:36:31 +0000 (13:36 -0800)]
Delete browerplugin tests - do not merge
Those don't build in all environments.
Change-Id: Ie564d464d2745df0114236f2c28aa1254d0f65b5
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:39:47 +0000 (07:39 -0800)]
am
9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge"
* commit '
9720323a5138acafbe30da38d61eeac469b675a4':
Delete browerplugin tests - do not merge
Robert Greenwalt [Sat, 29 Jan 2011 14:55:38 +0000 (06:55 -0800)]
am
6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread
* commit '
6b739dc7292452227cdd8abd90658f4db8f0ce70':
Add some network types that OEM's are asking for.
Robert Greenwalt [Sat, 29 Jan 2011 14:38:35 +0000 (06:38 -0800)]
Merge "Add some network types that OEM's are asking for." into gingerbread
Jean-Baptiste Queru [Sat, 29 Jan 2011 14:19:37 +0000 (06:19 -0800)]
stubs
Change-Id: I829039f3817a172e66eeb9df397e896a488a259d
Jean-Baptiste Queru [Fri, 28 Jan 2011 23:26:59 +0000 (15:26 -0800)]
Merge "Delete browerplugin tests - do not merge"
Robert Greenwalt [Fri, 28 Jan 2011 22:48:37 +0000 (14:48 -0800)]
Add some network types that OEM's are asking for.
Adding them hidden so that if OEM's are rolling their own at least they can
use the same values. Will mark them unhidden in a future sdk release.
bug:
3395729
Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c
Eric Fischer [Fri, 28 Jan 2011 22:19:36 +0000 (14:19 -0800)]
am
5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
5f2def8cfdad2491a646be69347444a3be6ddf84':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 28 Jan 2011 22:10:43 +0000 (14:10 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 28 Jan 2011 21:16:00 +0000 (13:16 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Id8afb303d2ecfc6270d1af1abd189c0ef0bf2314
Dirk Dougherty [Fri, 28 Jan 2011 20:00:51 +0000 (12:00 -0800)]
am
fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
* commit '
fa809dba8ec7f894bd53dba8e1cf742082c5cb3e':
Doc change: Add time-lapse video to 3.0 highlights.
Dirk Dougherty [Fri, 28 Jan 2011 19:57:42 +0000 (11:57 -0800)]
Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
Andreas Huber [Fri, 28 Jan 2011 18:42:10 +0000 (10:42 -0800)]
am
b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
* commit '
b6c2e2b46c574a90450438cccfb6cb97b7edc20f':
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.