Kenny Root
c0e7a06170
Merge "Continue idmap generation even if name lookup fails."
2011-07-21 13:05:03 -07:00
Robert Greenwalt
813dac24e4
Merge "First pass tying into per-interface DNS cache"
2011-07-21 11:16:12 -07:00
Xavier Ducrohet
dd6656872a
Merge "Fix to compile for windows"
2011-07-20 18:35:35 -07:00
Xavier Ducrohet
0d4b0738b5
Merge "Added Caching for PreProcessed PNGs"
2011-07-20 15:55:33 -07:00
Xavier Ducrohet
6e068693b3
Merge "Add generation of dependency file for .ap_ package"
2011-07-20 15:08:23 -07:00
Xavier Ducrohet
166845ba93
Merge "Add dependency generation to Aapt for R.java"
2011-07-19 10:03:16 -07:00
Xavier Ducrohet
c6c26cd7ec
Merge "Copy once-created R.java into library projects"
2011-07-19 10:03:05 -07:00
Conley Owens
0d0cbd3d03
Merge "stagefright aacenc: Mark codeWord as UWord16"
2011-07-18 16:49:43 -07:00
Deckard Autoverifier
fde808cbb3
Merge "stagefright: Include stdlib.h for malloc/free"
2011-07-18 15:23:41 -07:00
Deckard Autoverifier
e51e21c863
Merge "stagefright amrwbenc: Remove a duplicate, unused file"
2011-07-18 15:23:31 -07:00
Deckard Autoverifier
1ae41e21dc
Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
2011-07-18 15:23:20 -07:00
Deckard Autoverifier
605aac1879
Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
2011-07-18 15:23:09 -07:00
Conley Owens
9569289a8d
Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
2011-07-18 12:37:16 -07:00
Jaikumar Ganesh
95c15bacf5
Merge "Bluetooth: correcting return value from cancelDiscovery"
2011-07-13 10:04:19 -07:00
Robert Greenwalt
e7438cc6c2
Merge "Added methods to support dns cache per interface"
2011-07-01 09:26:50 -07:00
Conley Owens
efa5bc7e87
Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."
2011-06-30 08:11:25 -07:00
Jean-Baptiste Queru
8349a2278a
Merge "Add WEBP to the list of Image formats that support Compression."
2011-06-24 11:13:42 -07:00
Jean-Baptiste Queru
0891d8cbce
Merge "Tweak for forward-compatibility"
2011-06-24 11:08:36 -07:00
Jean-Baptiste Queru
a614150d74
Tweak for forward-compatibility
...
Change-Id: Ic5e4d949c1c80a2ebdc2ec802c35b5d3d7f9661d
2011-06-24 10:49:18 -07:00
Raphael Moll
ad81c78607
Merge "Laoutlib_creator: keep original of delegate methods."
2011-06-22 17:11:27 -07:00
Conley Owens
a77ed0e5f6
Merge "Check if we are in daylight time when calculating timezone"
2011-06-20 11:01:41 -07:00
Jean-Baptiste Queru
101d6fc4aa
Merge "Tweaks for forward-compatibility"
2011-06-18 09:45:53 -07:00
Jean-Baptiste Queru
3f3f5af40e
Tweaks for forward-compatibility
...
Change-Id: Iec525edc186e78d5d865f82dd5b1f56263c22e86
2011-06-18 09:42:04 -07:00
Conley Owens
c66e2523b9
Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
2011-06-09 11:12:04 -07:00
Jean-Baptiste Queru
16b844695c
Merge "Tweak setViewport stuff for fwd-compat"
2011-06-08 13:10:58 -07:00
Romain Guy
47a5fe58d2
Merge "Disable plugins if setPluginsEnabled(false) called."
2011-06-06 16:23:25 -07:00
Jaikumar Ganesh
51b46daea5
Merge "Require bonding and encryption for PBAP server"
2011-05-25 09:27:32 -07:00
Jean-Baptiste Queru
88f5a824a6
Merge "Adding support for parsing of SMS-CB pdus in UMTS format."
2011-05-25 08:06:17 -07:00
Conley Owens
4b4db99063
Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."
2011-05-24 14:05:05 -07:00
Jaikumar Ganesh
701d3366e0
Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board."
2011-05-20 13:37:00 -07:00
Jaikumar Ganesh
0b0b8a76d5
Merge "BT: Wrong publishing result of bonding error code."
2011-05-20 13:35:20 -07:00
Jaikumar Ganesh
ca7f168e4b
Merge "OBEX: Fix PrivateOutputStream small write problem"
2011-05-20 09:40:32 -07:00
Mårten Kongstad
963664b6b7
Continue idmap generation even if name lookup fails.
...
In resources.arsc files, a resource is represented by a specification
block and one or more value blocks. In rare cases, a resource name
is also given a new resource ID, a specification block and no values
blocks. This commit ensures idmap generation does not fail if such an
entry is encountered.
Change-Id: I32302a0b07a7a320b7eeb31886931be3bb7b7e9a
2011-05-19 16:02:35 +02:00
Jean-Baptiste Queru
14402a1a5a
Merge "support humidity sensor type"
2011-05-18 15:00:11 -07:00
Jean-Baptiste Queru
af859fa9ae
Merge "MOTOYA changed two kinds of Japanese font files."
2011-05-18 09:24:40 -07:00
Jean-Baptiste Queru
d698b563da
Merge "Adapt to latest skia"
2011-05-12 15:09:51 -07:00
Jean-Baptiste Queru
c97843ba1f
Merge "Ninepatch tweaks for better interop"
2011-05-12 14:24:09 -07:00
Jean-Baptiste Queru
fa5f5587ae
Merge "Tweak audio APIs for better forward/backward/sideways compatibility."
2011-05-12 14:19:41 -07:00
Jean-Baptiste Queru
cc5d30e103
Merge "Switch to SkSafeUnref for better portability"
2011-05-12 14:19:26 -07:00
Conley Owens
d701fd1819
am bcd029b6: Merge "Add missing clean-up of idmap file descriptors."
...
* commit 'bcd029b6c8dee19d2cefb00f3ff637b4dcd407b3':
Add missing clean-up of idmap file descriptors.
2011-05-05 14:03:15 -07:00
Jake Hamby
002083a227
am 4d53cb02: Merge "Enable support for SMS national language shift tables." into gingerbread
...
* commit '4d53cb02168fe35104d7e644dd9b3efd8ca4c91b':
Enable support for SMS national language shift tables.
2011-05-05 13:31:03 -07:00
Conley Owens
088cb8af97
Merge "Add missing clean-up of idmap file descriptors."
2011-05-05 13:22:18 -07:00
Jake Hamby
f068f4f487
Merge "Enable support for SMS national language shift tables." into gingerbread
2011-05-05 13:09:11 -07:00
Mårten Kongstad
3e17850f1c
Add missing clean-up of idmap file descriptors.
...
Change-Id: I9bdc9a4b7962f1a8dce77f4b213c8b9dc26e4b0f
2011-05-05 15:38:14 +02:00
Irfan Sheriff
02683c0f5a
am 1a5b6098: Handle GET_POWER failures
...
* commit '1a5b6098d5002ae07ce3f9bc514400a87c2b64fa':
Handle GET_POWER failures
2011-05-04 21:14:47 -07:00
Dan Morrill
b955b3327e
am 4ec33c2a: Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
...
* commit '4ec33c2aad59b2a745ee891c9b7246b9533d95e0':
Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
2011-05-03 14:59:52 -07:00
Conley Owens
1c4c6b4581
am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging code."
...
* commit '9c4ba2580e2ef582747cce2960804a2a5e4b776e':
Removing dead store; it was likely a relict of debuging code.
2011-05-03 12:07:19 -07:00
Conley Owens
d1820ffeb9
Merge "Removing dead store; it was likely a relict of debuging code."
2011-05-02 09:53:25 -07:00
Conley Owens
2f56d20cb0
am eb8171bc: Merge "Adjust mBiggerTouchSlopSquare to the suitable value"
...
* commit 'eb8171bcff9bd980dbdfc99b2d843a5bcc0ae3e5':
Adjust mBiggerTouchSlopSquare to the suitable value
2011-04-29 10:24:34 -07:00
Conley Owens
05e4042a1e
am 76616b13: Merge "Scolling using arrow keys with padding"
...
* commit '76616b138eb68a77a838a93fdf2f0322e982f706':
Scolling using arrow keys with padding
2011-04-29 10:24:29 -07:00