OSDN Git Service
Jim Miller [Thu, 26 Jan 2012 22:34:08 +0000 (14:34 -0800)]
am
fb9e3643: Merge "Fix
5620754: don\'t show pattern unlock after SIM unlock if not enabled."
* commit '
fb9e364380f91295490d1acbfc9a571cb6a4384b':
Fix
5620754: don't show pattern unlock after SIM unlock if not enabled.
Jim Miller [Thu, 26 Jan 2012 22:30:49 +0000 (14:30 -0800)]
Merge "Fix
5620754: don't show pattern unlock after SIM unlock if not enabled."
Eric Fischer [Thu, 26 Jan 2012 22:28:25 +0000 (14:28 -0800)]
am
b14ecd26: Merge "Import translations. DO NOT MERGE"
* commit '
b14ecd2684d5b2c1f284b669d2ffa9c19bfee7b4':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 26 Jan 2012 22:26:10 +0000 (14:26 -0800)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Thu, 26 Jan 2012 22:21:26 +0000 (14:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9ecc6b7fd129f9b430d96e4d65c656a2b71bd0af
Gilles Debunne [Thu, 26 Jan 2012 22:11:15 +0000 (14:11 -0800)]
am
e93c5171: Merge "Modified algorithm to remove duplicated suggestions"
* commit '
e93c51713c440d572913292926c6e606edd6c64d':
Modified algorithm to remove duplicated suggestions
Gilles Debunne [Thu, 26 Jan 2012 22:11:12 +0000 (14:11 -0800)]
am
89429a42: Merge "Remove @deprecate in View\'s fadingEdge"
* commit '
89429a42116ad26df6add801aba66e6e454a10dd':
Remove @deprecate in View's fadingEdge
Gilles Debunne [Thu, 26 Jan 2012 22:09:20 +0000 (14:09 -0800)]
Merge "Modified algorithm to remove duplicated suggestions"
Gilles Debunne [Thu, 26 Jan 2012 22:09:00 +0000 (14:09 -0800)]
Merge "Remove @deprecate in View's fadingEdge"
Stephen Hines [Thu, 26 Jan 2012 21:58:14 +0000 (13:58 -0800)]
am
caaac348: Merge "Fix bugs with unsigned rsAtomicCas/Max/Min."
* commit '
caaac348ed163f59cf1b8185bb14137050c18e7e':
Fix bugs with unsigned rsAtomicCas/Max/Min.
Stephen Hines [Thu, 26 Jan 2012 21:55:57 +0000 (13:55 -0800)]
Merge "Fix bugs with unsigned rsAtomicCas/Max/Min."
Gilles Debunne [Thu, 26 Jan 2012 01:44:00 +0000 (17:44 -0800)]
Remove @deprecate in View's fadingEdge
The comment of this field is also aggregated in the android.R.styleable#View
description. As a result, the @deprecated in the comment of this field also
applies to android.R.styleable#View which incorrectly appears deprecated.
This fixes the problem, although fadingEdge will no longer be marked as
deprecated in IDEs. I believe it is less important that to make View
deprecated.
Change-Id: I96d8e868001c4c853eb1536f8401275b9b1e689b
Scott Main [Thu, 26 Jan 2012 19:50:13 +0000 (11:50 -0800)]
am
7e4ef617: am
2de74f5f: am
6c055bbd: docs: add action bar icons ZIP
* commit '
7e4ef61732d7de33e34f5935cfad51049f65116a':
docs: add action bar icons ZIP
Scott Main [Thu, 26 Jan 2012 19:47:35 +0000 (11:47 -0800)]
am
2de74f5f: am
6c055bbd: docs: add action bar icons ZIP
* commit '
2de74f5fa9acc5fae5fc09aad861c13f7162d5cb':
docs: add action bar icons ZIP
Scott Main [Thu, 26 Jan 2012 19:44:58 +0000 (11:44 -0800)]
am
6c055bbd: docs: add action bar icons ZIP
* commit '
6c055bbdf475e6cd324912326c802244b9a76c3b':
docs: add action bar icons ZIP
Scott Main [Thu, 26 Jan 2012 19:35:20 +0000 (11:35 -0800)]
docs: add action bar icons ZIP
Change-Id: Id38d82655d6bcc468890a4db93a19ac4e385db13
Ben Cheng [Thu, 26 Jan 2012 19:19:16 +0000 (11:19 -0800)]
am
f429ff70: Merge "Preserve NEON callee-save registers d8-d15."
* commit '
f429ff70776c7cf68a6f726afdf984dbbf9e6901':
Preserve NEON callee-save registers d8-d15.
Ben Cheng [Thu, 26 Jan 2012 19:16:58 +0000 (11:16 -0800)]
Merge "Preserve NEON callee-save registers d8-d15."
Ben Cheng [Wed, 25 Jan 2012 21:42:42 +0000 (13:42 -0800)]
Preserve NEON callee-save registers d8-d15.
BUG:
5918479
Change-Id: I574bd5845d9e7e007c637aabbf170d03217d10ad
Jim Miller [Thu, 26 Jan 2012 02:26:12 +0000 (18:26 -0800)]
Fix
5620754: don't show pattern unlock after SIM unlock if not enabled.
This fixes a bug where the device would show pattern unlock after the user
entered the SIM PUK unlock code. The code now correctly determines that
the device isn't secure and thus shouldn't show the unlock screen.
Change-Id: I49fd749592154a4c5840038b92d54ca7ca086074
Stephen Hines [Thu, 26 Jan 2012 02:17:34 +0000 (18:17 -0800)]
Fix bugs with unsigned rsAtomicCas/Max/Min.
BUG=
5888007
rsAtomicMax/Min did not have proper semantics for unsigned integers. They were
always using signed comparisons. rsAtomicCas had the wrong function signature
in our math library, leading to no way to properly link/execute it.
Change-Id: I336cdd8cd9f2d8093f12e101b55b2797515f039b
Alex Sakhartchouk [Thu, 26 Jan 2012 02:06:25 +0000 (18:06 -0800)]
Merge "Adding shader textures and removing specialized code." into graphics-dev
Scott Main [Thu, 26 Jan 2012 02:05:58 +0000 (18:05 -0800)]
am
9413752f: am
e7ffc5a6: am
9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
* commit '
9413752f30a505dfd36fcedb26dc1dd933c9840d':
docs: remove the 1.0 icon template pack
Scott Main [Thu, 26 Jan 2012 02:03:20 +0000 (18:03 -0800)]
am
e7ffc5a6: am
9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
* commit '
e7ffc5a6335c5da24af9e2d6ffde6d6e4b8e5a23':
docs: remove the 1.0 icon template pack
Scott Main [Thu, 26 Jan 2012 02:00:42 +0000 (18:00 -0800)]
am
9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
* commit '
9ac4dd828065410efbb380992d996c7e93daf437':
docs: remove the 1.0 icon template pack
Alex Sakhartchouk [Thu, 26 Jan 2012 01:58:56 +0000 (17:58 -0800)]
Adding shader textures and removing specialized code.
Change-Id: Ie42928f9f7c1cee51ee2e0206b75e8239b75960a
Scott Main [Thu, 26 Jan 2012 01:58:54 +0000 (17:58 -0800)]
Merge "docs: remove the 1.0 icon template pack" into ics-mr1
Scott Main [Thu, 26 Jan 2012 01:57:14 +0000 (17:57 -0800)]
am
8a89e93b: am
1f9026ca: am
f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
* commit '
8a89e93ba40d6ce5534262f8dcd878817adfa08f':
docs: remove ADL presentation PDFs to conserve site space
Scott Main [Thu, 26 Jan 2012 01:54:48 +0000 (17:54 -0800)]
am
1f9026ca: am
f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
* commit '
1f9026caf1af0f7d3eb9de81641ac290fd340b4b':
docs: remove ADL presentation PDFs to conserve site space
Scott Main [Thu, 26 Jan 2012 01:54:28 +0000 (17:54 -0800)]
docs: remove the 1.0 icon template pack
Change-Id: Ia73426f67b95bc3c5aa39150a6518ee28a215b42
Scott Main [Thu, 26 Jan 2012 01:52:08 +0000 (17:52 -0800)]
am
f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
* commit '
f466db14ec32fbaf08a868df40f7685a7e7df3db':
docs: remove ADL presentation PDFs to conserve site space
Scott Main [Thu, 26 Jan 2012 01:50:20 +0000 (17:50 -0800)]
Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
Scott Main [Thu, 26 Jan 2012 01:47:46 +0000 (17:47 -0800)]
docs: remove ADL presentation PDFs to conserve site space
Change-Id: Ie606dc02943eb27a318b183b8ebd7201e3ee38bb
Joe Malin [Thu, 26 Jan 2012 01:35:26 +0000 (17:35 -0800)]
am
bf80175c: am
ba8dd79f: am
9f426604: am
a2a46f62: DOC CHANGE: New Content Provider topics
* commit '
bf80175cca216636edd4b139da581eaeaee31888':
DOC CHANGE: New Content Provider topics
Joe Malin [Thu, 26 Jan 2012 01:33:06 +0000 (17:33 -0800)]
am
ba8dd79f: am
9f426604: am
a2a46f62: DOC CHANGE: New Content Provider topics
* commit '
ba8dd79f4eb690fc7922fc4c9b0507d901a2d320':
DOC CHANGE: New Content Provider topics
Joe Malin [Thu, 26 Jan 2012 01:30:13 +0000 (17:30 -0800)]
am
9f426604: am
a2a46f62: DOC CHANGE: New Content Provider topics
* commit '
9f426604e6f21e31f8a2194dcff0ea7bf488eee2':
DOC CHANGE: New Content Provider topics
Joe Malin [Thu, 26 Jan 2012 01:27:46 +0000 (17:27 -0800)]
am
a2a46f62: DOC CHANGE: New Content Provider topics
* commit '
a2a46f629446af0935e8ebbbd7cdb55e395f79f3':
DOC CHANGE: New Content Provider topics
Svetoslav Ganov [Thu, 26 Jan 2012 01:11:35 +0000 (17:11 -0800)]
am
758d97c3: Merge "Fixing failing focus tests"
* commit '
758d97c3126144018b38d0e4ca4deb8b92420e0c':
Fixing failing focus tests
Svetoslav Ganov [Thu, 26 Jan 2012 01:09:54 +0000 (17:09 -0800)]
Merge "Fixing failing focus tests"
Svetoslav Ganov [Thu, 26 Jan 2012 01:00:26 +0000 (17:00 -0800)]
Fixing failing focus tests
Change-Id: I3df6a72f6340cbf2e42ce4913e28471e9358088b
Teng-Hui Zhu [Thu, 26 Jan 2012 00:56:02 +0000 (16:56 -0800)]
am
99b46be9: Merge "Make sure WebView get notified before the EGL context destroyed."
* commit '
99b46be97bd02d304024d692de12e5779ed34355':
Make sure WebView get notified before the EGL context destroyed.
Teng-Hui Zhu [Thu, 26 Jan 2012 00:53:05 +0000 (16:53 -0800)]
Merge "Make sure WebView get notified before the EGL context destroyed."
Dianne Hackborn [Thu, 26 Jan 2012 00:18:05 +0000 (16:18 -0800)]
am
52da22f2: Merge "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
* commit '
52da22f2731cf5f312be9a913295af6638e49595':
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Dianne Hackborn [Thu, 26 Jan 2012 00:15:43 +0000 (16:15 -0800)]
Merge "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
Alex Sakhartchouk [Wed, 25 Jan 2012 23:24:57 +0000 (15:24 -0800)]
Adding accidentally removed init block.
Change-Id: I66790a1c405e682d9ddd1beb36544844562e02c0
Teng-Hui Zhu [Wed, 25 Jan 2012 21:46:16 +0000 (13:46 -0800)]
Make sure WebView get notified before the EGL context destroyed.
bug:
5639899
Change-Id: Id778cf3dac1d2f6d6b8014b7a911b51dc14fcc8a
Dianne Hackborn [Wed, 25 Jan 2012 23:12:23 +0000 (15:12 -0800)]
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
Gilles Debunne [Wed, 25 Jan 2012 23:11:01 +0000 (15:11 -0800)]
am
3f696b26: Merge "Unbalanced batch edit begin and end leave TextView unresponsive"
* commit '
3f696b264e4a3dd28421e9e1a58fe2c6241f48e4':
Unbalanced batch edit begin and end leave TextView unresponsive
Gilles Debunne [Wed, 25 Jan 2012 23:08:29 +0000 (15:08 -0800)]
Merge "Unbalanced batch edit begin and end leave TextView unresponsive"
Gilles Debunne [Wed, 25 Jan 2012 22:57:40 +0000 (14:57 -0800)]
Modified algorithm to remove duplicated suggestions
Bug
5916225
Duplicates were removed when received from SpellChecker, in a way
that could move the top candidates lower in the list.
Moved that code to the part that creates the actual suggestion list,
to make it more generic. The order of the first SuggestionSpan is
guaranteed to be respected.
Also mentionned non null suggestions and fixed a problem in SuggestionSpan
constructor.
Change-Id: Iaa3b1b84ae512451e439e5c5e63448c2a19145b5
Fabrice Di Meglio [Wed, 25 Jan 2012 22:56:09 +0000 (14:56 -0800)]
am
842e3790: Merge "Update Javadoc for InputConnection.deleteSurroundingText()"
* commit '
842e379074e069d0273711399f45a2d7109f9e64':
Update Javadoc for InputConnection.deleteSurroundingText()
Fabrice Di Meglio [Wed, 25 Jan 2012 22:52:40 +0000 (14:52 -0800)]
Merge "Update Javadoc for InputConnection.deleteSurroundingText()"
Alex Sakhartchouk [Wed, 25 Jan 2012 22:44:04 +0000 (14:44 -0800)]
Merge "Changing blur passes to use new shader structure." into graphics-dev
Alex Sakhartchouk [Wed, 25 Jan 2012 22:34:54 +0000 (14:34 -0800)]
Changing blur passes to use new shader structure.
Change-Id: I8590cc7bfb0ae5b5b55a574852c4c86c3a914ce0
Gilles Debunne [Wed, 25 Jan 2012 22:09:23 +0000 (14:09 -0800)]
am
c6854d43: Merge "TextView\'s display list updated on layout"
* commit '
c6854d43fc13fe0c9818ba077dcdbe5204fa6bf2':
TextView's display list updated on layout
Gilles Debunne [Wed, 25 Jan 2012 22:07:08 +0000 (14:07 -0800)]
Merge "TextView's display list updated on layout"
Wink Saville [Wed, 25 Jan 2012 22:07:05 +0000 (14:07 -0800)]
am
b675f516: Merge "Add additional debug"
* commit '
b675f516da196103597542d2c03f30f70359808e':
Add additional debug
Wink Saville [Wed, 25 Jan 2012 22:04:59 +0000 (14:04 -0800)]
Merge "Add additional debug"
Wink Saville [Wed, 25 Jan 2012 21:47:54 +0000 (13:47 -0800)]
Add additional debug
When ConnectivityService#startUsingNetworkFeature is called and the
special network is not available output some additional information.
Change-Id: I34b226a208596fa6418f1f37a0feec1d274d493c
Wink Saville [Wed, 25 Jan 2012 21:47:13 +0000 (13:47 -0800)]
am
556f0dba: Merge "Fix ClassCastException"
* commit '
556f0dba10517c76b6f20e95e3f4510c0cfb5911':
Fix ClassCastException
Wink Saville [Wed, 25 Jan 2012 21:45:02 +0000 (13:45 -0800)]
Merge "Fix ClassCastException"
Fabrice Di Meglio [Wed, 25 Jan 2012 01:29:45 +0000 (17:29 -0800)]
Update Javadoc for InputConnection.deleteSurroundingText()
- give more precision about how the text is considered
Change-Id: Ie2f09bb3338e7dc0e98da0595d1500a6352d09d3
Nick Pelly [Wed, 25 Jan 2012 21:24:39 +0000 (13:24 -0800)]
am
c97a5520: Improve NDEF API\'s
* commit '
c97a552023c3c71079b39092e80c9b44f25a789b':
Improve NDEF API's
Nick Pelly [Thu, 5 Jan 2012 04:13:01 +0000 (15:13 +1100)]
Improve NDEF API's
o Add NdefRecord.toMimeType()
Maps the record to a MIME type
o Add NdefRecord.toUri()
Maps the record to a URI
o Add hidden NfcAdapter.dispatch()
Helps test the dispatch path.
o Modify createMime(), createUri() and createExternal():
Do not try and strictly follow RFC requirements for URI or MIME content
types. This just leads to heartbreak - the RFC requirements are too strict.
For example RFC1341 forbids the use of '.' in a MIME type, however this is in
common use in types such as "application/vnd.companyname". I think the best
approach is to only remove 'obvious' whitespace issues, and to convert
uppercase to lowercase as per Android guidelines.
Change-Id: Id686f5f3b05b2dceafad48e1cfcbdb2b3890b854
Nick Pelly [Wed, 25 Jan 2012 20:57:58 +0000 (12:57 -0800)]
am
dc828acd: Merge "Add API\'s for normalizing MIME\'s and URI\'s."
* commit '
dc828acd5fadb266b13cce459b1cacfad8ef7aef':
Add API's for normalizing MIME's and URI's.
Nick Pelly [Wed, 25 Jan 2012 20:55:58 +0000 (12:55 -0800)]
Merge "Add API's for normalizing MIME's and URI's."
Wink Saville [Wed, 25 Jan 2012 20:42:51 +0000 (12:42 -0800)]
Fix ClassCastException
In "Change I95ed2aae: Stop using shared DUN APN when tethering stops",
sha1:
8beff9586ff89a1e59469e9820fd9e9d704300d2, an assumption is made
that the msg.obj is always an ApnContext, this is not true for CDMA.
Eventually we plan on removing the destinction between GSM and CDMA but
for now we need to handle it handle it.
Bug:
5904734
Change-Id: I86873dc7aeda5234c14a6fe1e4ec7345ee30e957
Dianne Hackborn [Wed, 25 Jan 2012 20:32:13 +0000 (12:32 -0800)]
am
43ea4e10: Merge "Added JELLY_BEAN version name; update some targetSdkVersion docs."
* commit '
43ea4e10dc402d20f506cdb4b4f27e49b4dc0443':
Added JELLY_BEAN version name; update some targetSdkVersion docs.
Dianne Hackborn [Wed, 25 Jan 2012 20:29:17 +0000 (12:29 -0800)]
Merge "Added JELLY_BEAN version name; update some targetSdkVersion docs."
Gilles Debunne [Wed, 25 Jan 2012 19:57:06 +0000 (11:57 -0800)]
TextView's display list updated on layout
Bug
5903021
We need to invalidate the DL at anytime the layout is changed.
Change-Id: Ief06c988b88cdf1b35fe8ce9bac1243326ea44c4
Jeff Brown [Wed, 25 Jan 2012 19:54:58 +0000 (11:54 -0800)]
am
56965f97: Merge "Fix an inconsistent comment."
* commit '
56965f97b33941440ffa0fc711d5d0f68ea45170':
Fix an inconsistent comment.
Jeff Brown [Wed, 25 Jan 2012 19:52:48 +0000 (11:52 -0800)]
Merge "Fix an inconsistent comment."
Robert Greenwalt [Wed, 25 Jan 2012 19:36:04 +0000 (11:36 -0800)]
am
01e78a60: am
10953351: am
44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1
* commit '
01e78a60a44def8edcdbea4c7f85ac5bedec0211':
Filter our v6 address from tethering dns.
Robert Greenwalt [Wed, 25 Jan 2012 19:33:14 +0000 (11:33 -0800)]
am
10953351: am
44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1
* commit '
109533519153307b10e2b3ae327ca4b4cd0c75d3':
Filter our v6 address from tethering dns.
Robert Greenwalt [Wed, 25 Jan 2012 19:30:39 +0000 (11:30 -0800)]
am
44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1
* commit '
44f64c965776ae65ff85ef8c37afb7e14483bdf2':
Filter our v6 address from tethering dns.
Robert Greenwalt [Wed, 25 Jan 2012 19:28:30 +0000 (11:28 -0800)]
Merge "Filter our v6 address from tethering dns." into ics-mr1
Dianne Hackborn [Sun, 9 Oct 2011 23:00:21 +0000 (16:00 -0700)]
Added JELLY_BEAN version name; update some targetSdkVersion docs.
Change-Id: Ia38ff5b9ad2b63c2cf667260881222d9ff168052
Jeff Brown [Wed, 25 Jan 2012 18:42:27 +0000 (10:42 -0800)]
Fix an inconsistent comment.
Change-Id: Iae40dfcca091c9886a05e483f51596c96014e57f
Jean-Baptiste Queru [Wed, 25 Jan 2012 18:36:17 +0000 (10:36 -0800)]
am
61bd3396: am
95306d85: am
64085d03: am
12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '
61bd33968f5df9e67b60ef75e271ad6f4a7702a1':
stagefright aacenc: Fix type definitions for 64 bit platforms
Jean-Baptiste Queru [Wed, 25 Jan 2012 18:33:42 +0000 (10:33 -0800)]
am
95306d85: am
64085d03: am
12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '
95306d85005f165e10a25ad45cadadec6e1f6a31':
stagefright aacenc: Fix type definitions for 64 bit platforms
Jean-Baptiste Queru [Wed, 25 Jan 2012 18:30:31 +0000 (10:30 -0800)]
am
64085d03: am
12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '
64085d03efcd2abf3b8cd64f4e6344a1ece014c3':
stagefright aacenc: Fix type definitions for 64 bit platforms
Jean-Baptiste Queru [Wed, 25 Jan 2012 18:27:41 +0000 (10:27 -0800)]
am
12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '
12045502c49bfee40d7d3cb806d9b70d3b5d3ed3':
stagefright aacenc: Fix type definitions for 64 bit platforms
Jean-Michel Trivi [Wed, 25 Jan 2012 17:49:25 +0000 (09:49 -0800)]
am
171070d2: Merge "Update AudioTrack.stop() javadoc"
* commit '
171070d25ee35fbd38cdbb989dab7a62df8ff8cf':
Update AudioTrack.stop() javadoc
Jean-Michel Trivi [Wed, 25 Jan 2012 17:46:01 +0000 (09:46 -0800)]
Merge "Update AudioTrack.stop() javadoc"
Jean-Baptiste Queru [Wed, 25 Jan 2012 17:17:45 +0000 (09:17 -0800)]
Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
Roman Nurik [Wed, 25 Jan 2012 17:01:07 +0000 (09:01 -0800)]
am
00c3aaa2: am
92aaf243: am
cf077fdd: Merge "docs: Android Design typo and grammar fixes" into ics-mr1
* commit '
00c3aaa235fe9b247d0a3cc532ee3de728b15434':
docs: Android Design typo and grammar fixes
Jean-Baptiste Queru [Wed, 25 Jan 2012 17:01:04 +0000 (09:01 -0800)]
am
d4525204: am
e2594b85: am
4cd2b343: am
98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
* commit '
d452520464c5a8cdd7a8d0d09b2fdb92cea1eefb':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
Jean-Baptiste Queru [Wed, 25 Jan 2012 17:01:01 +0000 (09:01 -0800)]
am
28091796: am
a3946104: am
fc2ea24b: am
d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
* commit '
28091796a651b19fed6eb291cef041f08d27f886':
stagefright aacenc: Add missing newlines at the end of files
Daniel Sandler [Wed, 25 Jan 2012 17:00:58 +0000 (09:00 -0800)]
am
efbf376a: am
416a1c1a: am
185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1
* commit '
efbf376afd9e37112dcd44c607d5e865da07eec7':
Stop showing "No internet connection" when there is one.
Eric Laurent [Wed, 25 Jan 2012 17:00:55 +0000 (09:00 -0800)]
am
172870f3: am
535b0264: am
7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
* commit '
172870f37dc233922757d35d3180071fa84c59ef':
AudioFlinger: refine mixer sleep time logic
Eric Laurent [Wed, 25 Jan 2012 17:00:52 +0000 (09:00 -0800)]
am
9c7d56a7: am
dd347d51: (-s ours) am
41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
* commit '
9c7d56a78ba819fdc8046ab87c82ee2b57d200b5':
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
Roman Nurik [Wed, 25 Jan 2012 16:57:45 +0000 (08:57 -0800)]
am
92aaf243: am
cf077fdd: Merge "docs: Android Design typo and grammar fixes" into ics-mr1
* commit '
92aaf2431ccb8d5ef1eb456646742c736fa70266':
docs: Android Design typo and grammar fixes
Jean-Baptiste Queru [Wed, 25 Jan 2012 16:57:36 +0000 (08:57 -0800)]
am
e2594b85: am
4cd2b343: am
98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
* commit '
e2594b85093441e03150c7cfc540abc626884eaf':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
Jean-Baptiste Queru [Wed, 25 Jan 2012 16:57:32 +0000 (08:57 -0800)]
am
a3946104: am
fc2ea24b: am
d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
* commit '
a39461047eae6022e2c0ef873ffa2c7241b393a9':
stagefright aacenc: Add missing newlines at the end of files
Daniel Sandler [Wed, 25 Jan 2012 16:57:27 +0000 (08:57 -0800)]
am
416a1c1a: am
185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1
* commit '
416a1c1ada0ad553613eb439823a68d3f51b1579':
Stop showing "No internet connection" when there is one.
Eric Laurent [Wed, 25 Jan 2012 16:57:23 +0000 (08:57 -0800)]
am
535b0264: am
7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
* commit '
535b0264a4cfa790e549bd9cd09980788f1375f4':
AudioFlinger: refine mixer sleep time logic
Eric Laurent [Wed, 25 Jan 2012 16:57:20 +0000 (08:57 -0800)]
am
dd347d51: (-s ours) am
41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
* commit '
dd347d515d4a4e42b2aba89a8e471392026b7824':
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
Robert Greenwalt [Wed, 25 Jan 2012 16:56:25 +0000 (08:56 -0800)]
am
afacb33f: Merge "resolved conflicts for merge of
67cda1a0 to master"
* commit '
afacb33f7584ca2f762c2d15472917059c0e9503':
Use the carrier-given dns addrs for tethering.
Robert Greenwalt [Wed, 25 Jan 2012 16:54:59 +0000 (08:54 -0800)]
Merge "resolved conflicts for merge of
67cda1a0 to master"
George Mount [Wed, 25 Jan 2012 15:39:52 +0000 (07:39 -0800)]
am
17d3f667: Merge "Fix auto-complete for content-editable fields."
* commit '
17d3f6679aa0589494f958b586e769ae64eb3bca':
Fix auto-complete for content-editable fields.