summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing via Bin...tedbo2011-06-0913-6/+385
* Merge "Fix USE_TEXT_LAYOUT_CACHE define"Fabrice Di Meglio2011-06-063-19/+43
|\
| * Fix USE_TEXT_LAYOUT_CACHE defineFabrice Di Meglio2011-06-063-19/+43
* | Merge "Connecting to a NFC technology may fail."Martijn Coenen2011-06-062-1/+8
|\ \
| * | Connecting to a NFC technology may fail.Martijn Coenen2011-06-062-1/+8
* | | Merge "Copy pointer assets for hdpi."Jeff Brown2011-06-068-0/+20
|\ \ \
| * | | Copy pointer assets for hdpi.Jeff Brown2011-06-068-0/+20
* | | | am 92279c0f: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/...Nick Pelly2011-06-060-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/framew...Nick Pelly2011-06-0644-10/+420
| |\ \ \ \
* | \ \ \ \ am 51704fc9: am cecb710a: am 94260caf: Allow control over search order for te...TK MUN2011-06-062-2/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am cecb710a: am 94260caf: Allow control over search order for tethering upstr...TK MUN2011-06-062-2/+3
| |\ \ \ \ \
| | * \ \ \ \ am 94260caf: Allow control over search order for tethering upstream interface...TK MUN2011-05-252-2/+3
| | |\ \ \ \ \
| | | * | | | | Allow control over search order for tethering upstream interface selectionTK MUN2011-05-252-2/+3
* | | | | | | | am e34ed24f: (-s ours) am e9d32283: am b16b020d: Merge "Import revised transl...Eric Fischer2011-06-060-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" ...Eric Fischer2011-06-0644-10/+420
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycom...Eric Fischer2011-06-0644-10/+420
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2Eric Fischer2011-06-0644-10/+420
| | | |\ \ \ \ \ \
| | | | * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-06-0344-10/+420
* | | | | | | | | | am 5aaed097: am 58ada2f3: am 94062517: Merge "Require bonding and encryption ...Jaikumar Ganesh2011-06-061-3/+63
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server"Jaikumar Ganesh2011-06-061-3/+63
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | am 94062517: Merge "Require bonding and encryption for PBAP server"Jaikumar Ganesh2011-05-251-3/+63
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge "Require bonding and encryption for PBAP server"Jaikumar Ganesh2011-05-251-3/+63
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Require bonding and encryption for PBAP serverMathias Jeppsson2011-05-171-3/+63
* | | | | | | | | | | | am 59242cf6: am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of S...Jean-Baptiste Queru2011-06-063-28/+512
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | / / / | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in...Jean-Baptiste Queru2011-06-063-28/+512
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format."Jean-Baptiste Queru2011-05-253-28/+512
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge "Adding support for parsing of SMS-CB pdus in UMTS format."Jean-Baptiste Queru2011-05-253-28/+512
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Adding support for parsing of SMS-CB pdus in UMTS format.Henrik Hall2011-01-113-28/+512
* | | | | | | | | | | | Merge "resolved conflicts for merge of b2fd84ad to master"Marco Nelissen2011-06-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of b2fd84ad to masterMarco Nelissen2011-06-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | resolved conflicts for merge of b9783b49 to honeycomb-plus-aospMarco Nelissen2011-06-068-114/+115
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | am c9cd2387: Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into ginge...Simon Wilson2011-05-248-103/+115
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into gingerbreadSimon Wilson2011-05-248-103/+115
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Fix a race that could cause GL commands to be executed from the wrong thread.Mathias Agopian2011-05-236-97/+70
| | | | | * | | | | | | | | RefBase subclasses can now decide how they want to be destroyed.Mathias Agopian2011-05-232-4/+17
| | | | | * | | | | | | | | Fix a race in SurfaceFlinger that could cause layers to be leaked forever.Mathias Agopian2011-05-232-1/+17
| | | | | * | | | | | | | | Fix a race-condtion in SurfaceFlinger that could lead to a crash.Mathias Agopian2011-05-232-11/+21
* | | | | | | | | | | | | | Merge "Cleanup of Calendar.java to prep for api"RoboErik2011-06-061-264/+568
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Cleanup of Calendar.java to prep for apiRoboErik2011-06-061-264/+568
* | | | | | | | | | | | | | Merge "Unhiding render target code for renderscript"Alex Sakhartchouk2011-06-062-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Unhiding render target code for renderscriptAlex Sakhartchouk2011-06-062-1/+1
* | | | | | | | | | | | | | Merge "Delay set picture if necessary"John Reck2011-06-061-1/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Delay set picture if necessaryJohn Reck2011-06-041-1/+17
* | | | | | | | | | | | | | | Merge "Remove dead code related to gettid"Glenn Kasten2011-06-069-106/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove dead code related to gettidGlenn Kasten2011-06-039-106/+10
* | | | | | | | | | | | | | | | Merge "Add WebP Mime-Type support in Android Media File"Marco Nelissen2011-06-061-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add WebP Mime-Type support in Android Media FileVikas Arora2011-06-031-1/+3
* | | | | | | | | | | | | | | | Merge "Fix the false-alarm bug when we skip to the end, which should be OK."Shih-wei Liao2011-06-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix the false-alarm bug when we skip to the end, which should be OK.Shih-wei Liao2011-06-051-1/+1
* | | | | | | | | | | | | | | | | Merge "resolved conflict for merge of fc51aaec to master"Wink Saville2011-06-041-4/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \