OSDN Git Service
Andreas Huber [Thu, 16 Sep 2010 18:39:43 +0000 (11:39 -0700)]
am
62d4ebc0: am
49e1ae22: Merge "Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead." into gingerbread
Merge commit '
62d4ebc0423831dfd8165d359e5b809f00f60656'
* commit '
62d4ebc0423831dfd8165d359e5b809f00f60656':
Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead.
Andreas Huber [Thu, 16 Sep 2010 18:36:12 +0000 (11:36 -0700)]
am
49e1ae22: Merge "Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead." into gingerbread
Merge commit '
49e1ae22801f5f9e620552ffd205b05a0d89f65f' into gingerbread-plus-aosp
* commit '
49e1ae22801f5f9e620552ffd205b05a0d89f65f':
Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead.
Joe Onorato [Thu, 16 Sep 2010 18:35:39 +0000 (11:35 -0700)]
am
a85c4f16: am
d5d13286: Merge "This was marked @Deprecated in the docs, but it was misspelled." into gingerbread
Merge commit '
a85c4f165137ab360879bd9129259690ab6ac05d'
* commit '
a85c4f165137ab360879bd9129259690ab6ac05d':
This was marked @Deprecated in the docs, but it was misspelled.
Dirk Dougherty [Thu, 16 Sep 2010 18:32:30 +0000 (11:32 -0700)]
am
8ee9ecc1: am
9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread
Merge commit '
8ee9ecc145c9e05faf13f4bcf5853c888760c1b6'
* commit '
8ee9ecc145c9e05faf13f4bcf5853c888760c1b6':
Doc change: clean up droiddoc (cs) macros.
Jeff Brown [Thu, 16 Sep 2010 18:32:26 +0000 (11:32 -0700)]
am
03335af0: am
567c00a8: Merge "Fix NPE when handling certain kinds of ANRs." into gingerbread
Merge commit '
03335af0dbf14d1eb4503be92a5b10199719898c'
* commit '
03335af0dbf14d1eb4503be92a5b10199719898c':
Fix NPE when handling certain kinds of ANRs.
Andreas Huber [Thu, 16 Sep 2010 18:32:25 +0000 (11:32 -0700)]
Merge "Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead." into gingerbread
Joe Onorato [Thu, 16 Sep 2010 18:32:12 +0000 (11:32 -0700)]
am
ee76ed9c: am
4198cece: Merge "Fix the rest of the javadoc warnings." into gingerbread
Merge commit '
ee76ed9c0df11ac70ae67bae051cb64c9d79dafb'
* commit '
ee76ed9c0df11ac70ae67bae051cb64c9d79dafb':
Fix the rest of the javadoc warnings.
Joe Onorato [Thu, 16 Sep 2010 18:29:09 +0000 (11:29 -0700)]
am
d5d13286: Merge "This was marked @Deprecated in the docs, but it was misspelled." into gingerbread
Merge commit '
d5d1328690b8f274059954e3c1bc9008c4e02dd7' into gingerbread-plus-aosp
* commit '
d5d1328690b8f274059954e3c1bc9008c4e02dd7':
This was marked @Deprecated in the docs, but it was misspelled.
Joe Onorato [Thu, 16 Sep 2010 18:26:30 +0000 (11:26 -0700)]
Merge "This was marked @Deprecated in the docs, but it was misspelled." into gingerbread
Dirk Dougherty [Thu, 16 Sep 2010 18:19:54 +0000 (11:19 -0700)]
am
9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread
Merge commit '
9afd90939b1c2b298592b803c0bfa0b54ff7e453' into gingerbread-plus-aosp
* commit '
9afd90939b1c2b298592b803c0bfa0b54ff7e453':
Doc change: clean up droiddoc (cs) macros.
Dirk Dougherty [Thu, 16 Sep 2010 18:16:29 +0000 (11:16 -0700)]
Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread
Jeff Brown [Thu, 16 Sep 2010 18:08:46 +0000 (11:08 -0700)]
am
567c00a8: Merge "Fix NPE when handling certain kinds of ANRs." into gingerbread
Merge commit '
567c00a86f748ad4d798ae50a09505cc051fc095' into gingerbread-plus-aosp
* commit '
567c00a86f748ad4d798ae50a09505cc051fc095':
Fix NPE when handling certain kinds of ANRs.
Jeff Brown [Thu, 16 Sep 2010 18:06:29 +0000 (11:06 -0700)]
Merge "Fix NPE when handling certain kinds of ANRs." into gingerbread
Jeff Brown [Thu, 16 Sep 2010 18:02:16 +0000 (11:02 -0700)]
Fix NPE when handling certain kinds of ANRs.
Change-Id: Iccef1852e52c84f6f49d30c491431460a10b33d3
Andreas Huber [Thu, 16 Sep 2010 17:56:47 +0000 (10:56 -0700)]
am
7a848c0d: am
8946ab26: A ThreadedSource wraps around an existing MediaSource and reads output buffers on a separate thread. It\'s now used for the vpx decoder to decode frames ahead of time to improve playback performance.
Merge commit '
7a848c0d7cb1978155ab7743aadb2e07bc4bdcc6'
* commit '
7a848c0d7cb1978155ab7743aadb2e07bc4bdcc6':
A ThreadedSource wraps around an existing MediaSource and reads output buffers on a separate thread. It's now used for the vpx decoder to decode frames ahead of time to improve playback performance.
Joe Onorato [Thu, 16 Sep 2010 17:56:30 +0000 (10:56 -0700)]
am
f8a93cb7: (-s ours) am
8c9eacd9: Merge "DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags." into gingerbread
Merge commit '
f8a93cb7b9df2d6e84940b2f8741f8fd730d4c16'
* commit '
f8a93cb7b9df2d6e84940b2f8741f8fd730d4c16':
DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags.
Eric Laurent [Thu, 16 Sep 2010 17:56:25 +0000 (10:56 -0700)]
am
d32d3011: am
37de5da0: Merge "Fix problem in lvm effect bundle wrapper" into gingerbread
Merge commit '
d32d30119bd0c0988a6806f1205db5426235af52'
* commit '
d32d30119bd0c0988a6806f1205db5426235af52':
Fix problem in lvm effect bundle wrapper
Joe Onorato [Thu, 16 Sep 2010 17:56:14 +0000 (10:56 -0700)]
am
d35186ce: (-s ours) am
7747795a: Merge "These are not javadoc tags, they are annotations in sample code. Escape them properly." into gingerbread
Merge commit '
d35186ce1882b79db5aeaea7a5a6fdf4be89bcb8'
* commit '
d35186ce1882b79db5aeaea7a5a6fdf4be89bcb8':
These are not javadoc tags, they are annotations in sample code. Escape them properly.
Joe Onorato [Thu, 16 Sep 2010 17:41:54 +0000 (10:41 -0700)]
am
4198cece: Merge "Fix the rest of the javadoc warnings." into gingerbread
Merge commit '
4198cececf70bf034e12f19bb87f29cc29931c39' into gingerbread-plus-aosp
* commit '
4198cececf70bf034e12f19bb87f29cc29931c39':
Fix the rest of the javadoc warnings.
Joe Onorato [Thu, 16 Sep 2010 17:39:46 +0000 (10:39 -0700)]
Merge "Fix the rest of the javadoc warnings." into gingerbread
Joe Onorato [Thu, 16 Sep 2010 17:29:33 +0000 (10:29 -0700)]
Merge "These are not javadoc tags, they are annotations in sample code. Escape them properly."
Joe Onorato [Thu, 16 Sep 2010 17:29:20 +0000 (10:29 -0700)]
Merge "DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags."
Andreas Huber [Thu, 16 Sep 2010 17:02:52 +0000 (10:02 -0700)]
am
8946ab26: A ThreadedSource wraps around an existing MediaSource and reads output buffers on a separate thread. It\'s now used for the vpx decoder to decode frames ahead of time to improve playback performance.
Merge commit '
8946ab2618a4eebfdf7b00c6b68e6a5d8432cafa' into gingerbread-plus-aosp
* commit '
8946ab2618a4eebfdf7b00c6b68e6a5d8432cafa':
A ThreadedSource wraps around an existing MediaSource and reads output buffers on a separate thread. It's now used for the vpx decoder to decode frames ahead of time to improve playback performance.
Joe Onorato [Thu, 16 Sep 2010 16:27:56 +0000 (09:27 -0700)]
am
8c9eacd9: Merge "DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags." into gingerbread
Merge commit '
8c9eacd9b9669642b052e3349d55c6a303f54b31' into gingerbread-plus-aosp
* commit '
8c9eacd9b9669642b052e3349d55c6a303f54b31':
DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags.
Eric Laurent [Thu, 16 Sep 2010 16:27:52 +0000 (09:27 -0700)]
am
37de5da0: Merge "Fix problem in lvm effect bundle wrapper" into gingerbread
Merge commit '
37de5da03b33e85c2b0561b9a32e3c5395cfbc15' into gingerbread-plus-aosp
* commit '
37de5da03b33e85c2b0561b9a32e3c5395cfbc15':
Fix problem in lvm effect bundle wrapper
Joe Onorato [Thu, 16 Sep 2010 16:27:42 +0000 (09:27 -0700)]
am
7747795a: Merge "These are not javadoc tags, they are annotations in sample code. Escape them properly." into gingerbread
Merge commit '
7747795af508354b3792e497e6a7b4bc749b4007' into gingerbread-plus-aosp
* commit '
7747795af508354b3792e497e6a7b4bc749b4007':
These are not javadoc tags, they are annotations in sample code. Escape them properly.
Joe Onorato [Thu, 16 Sep 2010 16:04:43 +0000 (09:04 -0700)]
Merge "DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags." into gingerbread
Eric Laurent [Thu, 16 Sep 2010 16:04:37 +0000 (09:04 -0700)]
Merge "Fix problem in lvm effect bundle wrapper" into gingerbread
Joe Onorato [Thu, 16 Sep 2010 16:02:35 +0000 (09:02 -0700)]
Merge "These are not javadoc tags, they are annotations in sample code. Escape them properly." into gingerbread
Steve Block [Thu, 16 Sep 2010 11:59:28 +0000 (04:59 -0700)]
Merge "Make DumpRenderTree2 appear in the 'Dev Tools' application"
Hung-ying Tyan [Thu, 16 Sep 2010 11:53:30 +0000 (04:53 -0700)]
am
f4fd88f8: am
c7510581: SipService: add log control, suppress ping log.
Merge commit '
f4fd88f8d8cacff718268b6349bcb8c6a28006f3'
* commit '
f4fd88f8d8cacff718268b6349bcb8c6a28006f3':
SipService: add log control, suppress ping log.
Hung-ying Tyan [Thu, 16 Sep 2010 11:50:25 +0000 (04:50 -0700)]
am
c7510581: SipService: add log control, suppress ping log.
Merge commit '
c7510581b81d63536db7d46ca8533106c8cf57c6' into gingerbread-plus-aosp
* commit '
c7510581b81d63536db7d46ca8533106c8cf57c6':
SipService: add log control, suppress ping log.
Chung-yih Wang [Thu, 16 Sep 2010 11:48:15 +0000 (04:48 -0700)]
am
170255b0: am
d8f3d167: Add a new phone state ANSWERING.
Merge commit '
170255b0f0482baf843b881a02d9361adcc33742'
* commit '
170255b0f0482baf843b881a02d9361adcc33742':
Add a new phone state ANSWERING.
Chung-yih Wang [Thu, 16 Sep 2010 11:45:44 +0000 (04:45 -0700)]
am
d8f3d167: Add a new phone state ANSWERING.
Merge commit '
d8f3d167353f6c6f6c5cb7a4c8e941c03b8e9511' into gingerbread-plus-aosp
* commit '
d8f3d167353f6c6f6c5cb7a4c8e941c03b8e9511':
Add a new phone state ANSWERING.
Chung-yih Wang [Thu, 16 Sep 2010 06:35:37 +0000 (23:35 -0700)]
am
1e27dc97: am
0e063382: Fix the unhandled authentication message.
Merge commit '
1e27dc978d5e929679f96eaed541c14b37cd1118'
* commit '
1e27dc978d5e929679f96eaed541c14b37cd1118':
Fix the unhandled authentication message.
Chung-yih Wang [Thu, 16 Sep 2010 06:32:34 +0000 (23:32 -0700)]
am
0e063382: Fix the unhandled authentication message.
Merge commit '
0e0633828928481658c0e09e5893f6214b57ba38' into gingerbread-plus-aosp
* commit '
0e0633828928481658c0e09e5893f6214b57ba38':
Fix the unhandled authentication message.
Chet Haase [Thu, 16 Sep 2010 04:53:07 +0000 (21:53 -0700)]
am
7ddff990: (-s ours) am
07980dc8: Merge "Adding new assets for designers" into gingerbread
Merge commit '
7ddff990ac2626d0e174ab57ff7bdc422e1d0fbf'
* commit '
7ddff990ac2626d0e174ab57ff7bdc422e1d0fbf':
Adding new assets for designers
Jeff Brown [Thu, 16 Sep 2010 04:42:28 +0000 (21:42 -0700)]
am
7642c82c: am
f4d788c9: Merge "Make input dispatcher only ANR for foreground windows." into gingerbread
Merge commit '
7642c82c291051919aad87c797e2dc1d77ed55e1'
* commit '
7642c82c291051919aad87c797e2dc1d77ed55e1':
Make input dispatcher only ANR for foreground windows.
David Brown [Thu, 16 Sep 2010 04:30:12 +0000 (21:30 -0700)]
resolved conflicts for merge of
9c43fffc to master
Change-Id: I6b5931bae7a9507b006c723db6c0b9589038e05c
Chet Haase [Thu, 16 Sep 2010 04:16:35 +0000 (21:16 -0700)]
am
07980dc8: Merge "Adding new assets for designers" into gingerbread
Merge commit '
07980dc8a723c6a26003c1ebe74372a2b4fa6777' into gingerbread-plus-aosp
* commit '
07980dc8a723c6a26003c1ebe74372a2b4fa6777':
Adding new assets for designers
Chet Haase [Thu, 16 Sep 2010 04:14:09 +0000 (21:14 -0700)]
Merge "Adding new assets for designers" into gingerbread
Jeff Hamilton [Thu, 16 Sep 2010 03:45:53 +0000 (20:45 -0700)]
Merge "Add new items to the BrowserContract."
Robert Greenwalt [Thu, 16 Sep 2010 02:49:53 +0000 (19:49 -0700)]
am
f434dd16: am
134b28a7: Merge "Update Inet Connection Status display" into gingerbread
Merge commit '
f434dd1660f222a1ee85e77c98893b90857805c2'
* commit '
f434dd1660f222a1ee85e77c98893b90857805c2':
Update Inet Connection Status display
Chris Palmer [Thu, 16 Sep 2010 02:49:35 +0000 (19:49 -0700)]
am
1b60963c: am
b8dbdc29: Clarify the danger of READ_LOGS and DUMP permissions.
Merge commit '
1b60963c42e159aacc52d688defcac206e5ecec0'
* commit '
1b60963c42e159aacc52d688defcac206e5ecec0':
Clarify the danger of READ_LOGS and DUMP permissions.
Michael Jurka [Thu, 16 Sep 2010 02:44:29 +0000 (19:44 -0700)]
Merge "fixing bug where changing alpha on one textview changed alpha on all other textviews with the same drawable"
Andreas Huber [Thu, 16 Sep 2010 02:11:10 +0000 (19:11 -0700)]
am
f8297ba0: am
24a2c2b5: Merge "Upgrade to the latest .webm project code." into gingerbread
Merge commit '
f8297ba011af959331873e09612665a486e1a1a7'
* commit '
f8297ba011af959331873e09612665a486e1a1a7':
Upgrade to the latest .webm project code.
Wu-cheng Li [Thu, 16 Sep 2010 02:11:05 +0000 (19:11 -0700)]
am
d63d7474: am
3fd5fa4c: Fix the runtime restart due to name change.
Merge commit '
d63d74749f068f93ead2f8c37ad3fe025dfd312f'
* commit '
d63d74749f068f93ead2f8c37ad3fe025dfd312f':
Fix the runtime restart due to name change.
Erik [Thu, 16 Sep 2010 02:10:10 +0000 (19:10 -0700)]
am
bfbab8ca: am
a8cc20e5: Merge "b/
3004029 Fixed content resolver loss" into gingerbread
Merge commit '
bfbab8ca36ed62a71118b355f2b8d8985bdb9d38'
* commit '
bfbab8ca36ed62a71118b355f2b8d8985bdb9d38':
b/
3004029 Fixed content resolver loss
Erik [Thu, 16 Sep 2010 02:10:04 +0000 (19:10 -0700)]
am
42e72e57: am
344d9663: Merge "Close tz query cursor when done." into gingerbread
Merge commit '
42e72e570b66c3bed316a9e7a766d2f8fc986ae6'
* commit '
42e72e570b66c3bed316a9e7a766d2f8fc986ae6':
Close tz query cursor when done.
Chet Haase [Thu, 16 Sep 2010 02:09:59 +0000 (19:09 -0700)]
am
5ae52f68: (-s ours) am
8f385aff: Merge "Add new/changed drawable assets from design team" into gingerbread
Merge commit '
5ae52f68cfda6629ab55de313ec5e45f34f8a267'
* commit '
5ae52f68cfda6629ab55de313ec5e45f34f8a267':
Add new/changed drawable assets from design team
Wu-cheng Li [Thu, 16 Sep 2010 02:03:01 +0000 (19:03 -0700)]
am
4db458b4: am
a6f41495: Merge "Update camera API and javadoc for API review comments." into gingerbread
Merge commit '
4db458b4f71cd9ccbb98f5bf2c08e1f0eb750548'
* commit '
4db458b4f71cd9ccbb98f5bf2c08e1f0eb750548':
Update camera API and javadoc for API review comments.
James Dong [Thu, 16 Sep 2010 02:02:45 +0000 (19:02 -0700)]
am
0cd2472b: am
82a39f4a: Merge "Add some explicit error log messages" into gingerbread
Merge commit '
0cd2472bf8a0062b56b9cd4613c44791b32fe42f'
* commit '
0cd2472bf8a0062b56b9cd4613c44791b32fe42f':
Add some explicit error log messages
James Dong [Thu, 16 Sep 2010 02:02:39 +0000 (19:02 -0700)]
am
beb55f57: am
9f882c0b: Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread
Merge commit '
beb55f572fd217174ebf8f6679792a6b22896645'
* commit '
beb55f572fd217174ebf8f6679792a6b22896645':
Fix audio input sample timestamp when audio driver loses audio samples
Jeff Brown [Thu, 16 Sep 2010 01:57:48 +0000 (18:57 -0700)]
am
f4d788c9: Merge "Make input dispatcher only ANR for foreground windows." into gingerbread
Merge commit '
f4d788c9309bc5480100d980608472e4cb04f309' into gingerbread-plus-aosp
* commit '
f4d788c9309bc5480100d980608472e4cb04f309':
Make input dispatcher only ANR for foreground windows.
Jeff Brown [Thu, 16 Sep 2010 01:55:25 +0000 (18:55 -0700)]
Merge "Make input dispatcher only ANR for foreground windows." into gingerbread
Jeff Brown [Wed, 15 Sep 2010 22:18:56 +0000 (15:18 -0700)]
Make input dispatcher only ANR for foreground windows.
Redesigned the input dispatcher's ANR timeout mechanism so it is much
closer to Froyo's policy. ANR is only ever signalled if the dispatcher
is waiting on a window to finish processing its previous event(s) and
there is new pending input.
In the old code, we tracked the dispatch timeout separately for each
input channel. This was somewhat complicated and also resulted in the
situation where applications could ANR long after the user had pushed
them into the background.
Change-Id: I666ecada0952d4b95f1d67b9f733842b745c7f4b
David Brown [Thu, 16 Sep 2010 01:38:25 +0000 (18:38 -0700)]
am
747c6153: ContactsContract: update SipAddress to be multi-valued
Merge commit '
747c61535281b4d2958e293e83245a19ba58f6a0' into gingerbread-plus-aosp
* commit '
747c61535281b4d2958e293e83245a19ba58f6a0':
ContactsContract: update SipAddress to be multi-valued
Romain Guy [Thu, 16 Sep 2010 01:15:10 +0000 (18:15 -0700)]
Merge "Fix 9patch rendering."
Robert Greenwalt [Thu, 16 Sep 2010 01:02:59 +0000 (18:02 -0700)]
am
134b28a7: Merge "Update Inet Connection Status display" into gingerbread
Merge commit '
134b28a7f049719cb74fd5baadbbcc5915bc861b' into gingerbread-plus-aosp
* commit '
134b28a7f049719cb74fd5baadbbcc5915bc861b':
Update Inet Connection Status display
Robert Greenwalt [Thu, 16 Sep 2010 00:59:54 +0000 (17:59 -0700)]
Merge "Update Inet Connection Status display" into gingerbread
Hung-ying Tyan [Thu, 16 Sep 2010 00:54:01 +0000 (17:54 -0700)]
am
1e563f91: am
968735e5: Merge "Fixing the NPE in SipPhone bug id: b/
2987816" into gingerbread
Merge commit '
1e563f91183d95f5ad2461b7bca864e8f223ef71'
* commit '
1e563f91183d95f5ad2461b7bca864e8f223ef71':
Fixing the NPE in SipPhone
Hung-ying Tyan [Thu, 16 Sep 2010 00:53:53 +0000 (17:53 -0700)]
am
6962aff3: am
698ddb0c: Merge "Fix links in SIP API javadoc." into gingerbread
Merge commit '
6962aff36be9d91ad40ead326bd54fc90965f6f0'
* commit '
6962aff36be9d91ad40ead326bd54fc90965f6f0':
Fix links in SIP API javadoc.
Mathias Agopian [Thu, 16 Sep 2010 00:53:43 +0000 (17:53 -0700)]
am
310da64d: am
f182e8a8: fix a typo where the eventtags code were wrong
Merge commit '
310da64d78750cdba4349d7cc0a268c07155569d'
* commit '
310da64d78750cdba4349d7cc0a268c07155569d':
fix a typo where the eventtags code were wrong
Andreas Huber [Thu, 16 Sep 2010 00:53:17 +0000 (17:53 -0700)]
am
7ff94577: am
9909b948: Merge "Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting." into gingerbread
Merge commit '
7ff945775210c60e6f113fb00903449cbb05c68a'
* commit '
7ff945775210c60e6f113fb00903449cbb05c68a':
Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting.
David Brown [Thu, 16 Sep 2010 00:43:34 +0000 (17:43 -0700)]
am
0237cf2e: am
8626d1a3: Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread
Merge commit '
0237cf2eace5d35410e95f586fd40c3068c94582'
* commit '
0237cf2eace5d35410e95f586fd40c3068c94582':
Mark MODIFY_PHONE_STATE permission as signatureOrSystem
Chris Palmer [Thu, 16 Sep 2010 00:33:22 +0000 (17:33 -0700)]
am
b8dbdc29: Clarify the danger of READ_LOGS and DUMP permissions.
Merge commit '
b8dbdc293a8495a873a9c36353d6a9408c698256' into gingerbread-plus-aosp
* commit '
b8dbdc293a8495a873a9c36353d6a9408c698256':
Clarify the danger of READ_LOGS and DUMP permissions.
Andreas Huber [Thu, 16 Sep 2010 00:24:53 +0000 (17:24 -0700)]
am
24a2c2b5: Merge "Upgrade to the latest .webm project code." into gingerbread
Merge commit '
24a2c2b59670b4d9083ff0d23c87d3910a632e7d' into gingerbread-plus-aosp
* commit '
24a2c2b59670b4d9083ff0d23c87d3910a632e7d':
Upgrade to the latest .webm project code.
Wu-cheng Li [Thu, 16 Sep 2010 00:24:40 +0000 (17:24 -0700)]
am
3fd5fa4c: Fix the runtime restart due to name change.
Merge commit '
3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5' into gingerbread-plus-aosp
* commit '
3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5':
Fix the runtime restart due to name change.
James Dong [Thu, 16 Sep 2010 00:04:15 +0000 (17:04 -0700)]
Merge "Fix potential unintialized variable yuvformat"
Hung-ying Tyan [Wed, 15 Sep 2010 23:47:30 +0000 (16:47 -0700)]
am
8a33e964: am
5306e0a8: Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread
Merge commit '
8a33e964c48d22469487c8ec1d951826b7e3e562'
* commit '
8a33e964c48d22469487c8ec1d951826b7e3e562':
SIP: add PEER_NOT_REACHABLE error feedback.
Hung-ying Tyan [Wed, 15 Sep 2010 23:47:22 +0000 (16:47 -0700)]
am
8d9e8de2: am
096df819: Merge "SipService: send SERVER_ERROR if server doesn\'t provide nonce" into gingerbread
Merge commit '
8d9e8de2c920e8c9dc2da33410780ec739076bb9'
* commit '
8d9e8de2c920e8c9dc2da33410780ec739076bb9':
SipService: send SERVER_ERROR if server doesn't provide nonce
Kenny Root [Wed, 15 Sep 2010 23:32:45 +0000 (16:32 -0700)]
am
79a1ee42: am
cee0b97e: Merge "Free AssetManager weak refs before unmounting" into gingerbread
Merge commit '
79a1ee4249aadc84558dad2e275b8edde198da76'
* commit '
79a1ee4249aadc84558dad2e275b8edde198da76':
Free AssetManager weak refs before unmounting
Steve Howard [Wed, 15 Sep 2010 23:32:30 +0000 (16:32 -0700)]
am
d2de99e3: am
536ee090: Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread
Merge commit '
d2de99e377408dc28dca5e4c61a816879595fbf3'
* commit '
d2de99e377408dc28dca5e4c61a816879595fbf3':
Fix name shadowing bug with revoking URI permissions.
Chris Palmer [Wed, 15 Sep 2010 23:32:18 +0000 (16:32 -0700)]
am
c5e2e26b: (-s ours) am
5bade703: Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread
Merge commit '
c5e2e26b9da40dc0941d0a6a33a82d8923924051'
* commit '
c5e2e26b9da40dc0941d0a6a33a82d8923924051':
DO NOT MERGE Correct the PackageManager.checkSignatures documentation.
Andreas Huber [Wed, 15 Sep 2010 23:23:06 +0000 (16:23 -0700)]
Merge "Upgrade to the latest .webm project code." into gingerbread
Erik [Wed, 15 Sep 2010 22:54:27 +0000 (15:54 -0700)]
am
a8cc20e5: Merge "b/
3004029 Fixed content resolver loss" into gingerbread
Merge commit '
a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b' into gingerbread-plus-aosp
* commit '
a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b':
b/
3004029 Fixed content resolver loss
Erik [Wed, 15 Sep 2010 22:54:22 +0000 (15:54 -0700)]
am
344d9663: Merge "Close tz query cursor when done." into gingerbread
Merge commit '
344d96635ec40e0c541f32064f42c8ad38e4505a' into gingerbread-plus-aosp
* commit '
344d96635ec40e0c541f32064f42c8ad38e4505a':
Close tz query cursor when done.
Erik [Wed, 15 Sep 2010 22:51:53 +0000 (15:51 -0700)]
Merge "b/
3004029 Fixed content resolver loss" into gingerbread
Erik [Wed, 15 Sep 2010 22:51:37 +0000 (15:51 -0700)]
Merge "Close tz query cursor when done." into gingerbread
Chet Haase [Wed, 15 Sep 2010 22:36:58 +0000 (15:36 -0700)]
am
8f385aff: Merge "Add new/changed drawable assets from design team" into gingerbread
Merge commit '
8f385affafddc1147b9dc4f0c4f49449ebf477c9' into gingerbread-plus-aosp
* commit '
8f385affafddc1147b9dc4f0c4f49449ebf477c9':
Add new/changed drawable assets from design team
Chet Haase [Wed, 15 Sep 2010 22:33:31 +0000 (15:33 -0700)]
Merge "Add new/changed drawable assets from design team" into gingerbread
Wu-cheng Li [Wed, 15 Sep 2010 22:01:09 +0000 (15:01 -0700)]
am
a6f41495: Merge "Update camera API and javadoc for API review comments." into gingerbread
Merge commit '
a6f41495962c6427cfb3976daeb7f7b4df63ac57' into gingerbread-plus-aosp
* commit '
a6f41495962c6427cfb3976daeb7f7b4df63ac57':
Update camera API and javadoc for API review comments.
Wu-cheng Li [Wed, 15 Sep 2010 21:57:59 +0000 (14:57 -0700)]
Merge "Update camera API and javadoc for API review comments." into gingerbread
James Dong [Wed, 15 Sep 2010 21:55:46 +0000 (14:55 -0700)]
am
82a39f4a: Merge "Add some explicit error log messages" into gingerbread
Merge commit '
82a39f4aabb5b44801690a95fcf61d4f2ab97a8e' into gingerbread-plus-aosp
* commit '
82a39f4aabb5b44801690a95fcf61d4f2ab97a8e':
Add some explicit error log messages
James Dong [Wed, 15 Sep 2010 21:55:38 +0000 (14:55 -0700)]
am
9f882c0b: Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread
Merge commit '
9f882c0b10ddbd436e24e51db8b1063bc5591d24' into gingerbread-plus-aosp
* commit '
9f882c0b10ddbd436e24e51db8b1063bc5591d24':
Fix audio input sample timestamp when audio driver loses audio samples
Jim Miller [Wed, 15 Sep 2010 21:53:05 +0000 (14:53 -0700)]
Merge "Add new Carousel callbacks to RecentApplicationsActivity."
James Dong [Wed, 15 Sep 2010 21:51:57 +0000 (14:51 -0700)]
Merge "Add some explicit error log messages" into gingerbread
James Dong [Wed, 15 Sep 2010 21:51:49 +0000 (14:51 -0700)]
Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread
Paul Westbrook [Wed, 15 Sep 2010 21:23:28 +0000 (14:23 -0700)]
Merge "Enable downloads of https urls"
Makoto Onuki [Wed, 15 Sep 2010 20:34:05 +0000 (13:34 -0700)]
Merge "Add AbstractCursor.getNotificationUri."
Hung-ying Tyan [Wed, 15 Sep 2010 20:06:30 +0000 (13:06 -0700)]
am
968735e5: Merge "Fixing the NPE in SipPhone bug id: b/
2987816" into gingerbread
Merge commit '
968735e580b7728c6a17aff9b7356f9d74dc6eb3' into gingerbread-plus-aosp
* commit '
968735e580b7728c6a17aff9b7356f9d74dc6eb3':
Fixing the NPE in SipPhone
Hung-ying Tyan [Wed, 15 Sep 2010 20:02:46 +0000 (13:02 -0700)]
Merge "Fixing the NPE in SipPhone bug id: b/
2987816" into gingerbread
Hung-ying Tyan [Wed, 15 Sep 2010 19:59:04 +0000 (12:59 -0700)]
am
698ddb0c: Merge "Fix links in SIP API javadoc." into gingerbread
Merge commit '
698ddb0cd64f7e317ae2f98de05d6462f22b2b2a' into gingerbread-plus-aosp
* commit '
698ddb0cd64f7e317ae2f98de05d6462f22b2b2a':
Fix links in SIP API javadoc.
Hung-ying Tyan [Wed, 15 Sep 2010 19:56:36 +0000 (12:56 -0700)]
Merge "Fix links in SIP API javadoc." into gingerbread
Mathias Agopian [Wed, 15 Sep 2010 19:53:59 +0000 (12:53 -0700)]
am
f182e8a8: fix a typo where the eventtags code were wrong
Merge commit '
f182e8a8c2e726b376f3f4c0deb02dfdb6ae06a9' into gingerbread-plus-aosp
* commit '
f182e8a8c2e726b376f3f4c0deb02dfdb6ae06a9':
fix a typo where the eventtags code were wrong
Mathias Agopian [Wed, 15 Sep 2010 19:46:59 +0000 (12:46 -0700)]
fix a typo where the eventtags code were wrong
Change-Id: I517112a1475c10b71009a0aa9c3894c76a1f270f
Joe Onorato [Wed, 15 Sep 2010 19:36:21 +0000 (12:36 -0700)]
Merge "fix the build."
John Wang [Wed, 15 Sep 2010 19:33:19 +0000 (12:33 -0700)]
am
8028bd5b: am
6457a28b: Merge "Complete event registration in CallManager." into gingerbread
Merge commit '
8028bd5b696fd94d33c905c4279d6505e985d70b'
* commit '
8028bd5b696fd94d33c905c4279d6505e985d70b':
Complete event registration in CallManager.
Erik [Wed, 15 Sep 2010 19:32:46 +0000 (12:32 -0700)]
am
0b46070d: am
426ee7f2: Fixes some bugs in TimeZoneUtils
Merge commit '
0b46070d8878a8791f343cbbe720388e7dfe4e6f'
* commit '
0b46070d8878a8791f343cbbe720388e7dfe4e6f':
Fixes some bugs in TimeZoneUtils
Jeff Brown [Wed, 15 Sep 2010 19:32:29 +0000 (12:32 -0700)]
am
14bc6b5d: am
09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread
Merge commit '
14bc6b5d0677e5c454a67775c852f90389bb4567'
* commit '
14bc6b5d0677e5c454a67775c852f90389bb4567':
Replace epoll() with poll() and rename PollLoop to Looper.
OSDN Git Service
