summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Clarify the meaning of weight in the focus and metering area HAL.Eino-Ville Talvala2011-04-251-8/+11
* Merge "First bits of WebDriver containing blocking function to load a page an...Steve Block2011-04-142-0/+409
|\
| * First bits of WebDriver containing blocking function to load a page andDounia Berrada2011-04-142-0/+409
* | Merge "Rewrite battery history storage."Dianne Hackborn2011-04-142-147/+385
|\ \
| * | Rewrite battery history storage.Dianne Hackborn2011-04-142-147/+385
* | | Merge "Fix around suggestionSpan."Gilles Debunne2011-04-142-3/+8
|\ \ \ | |/ / |/| |
| * | Fix around suggestionSpan.Gilles Debunne2011-04-132-3/+8
* | | am a4b76ff4: am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset...Xia Wang2011-04-133-57/+26
|\ \ \ | |/ / |/| |
| * | am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static link ...Xia Wang2011-04-133-57/+26
| |\ \
| | * \ am 46b59ef0: Merge "Fix access point parsing: reset static link property afte...Xia Wang2011-04-133-57/+26
| | |\ \
| | | * \ Merge "Fix access point parsing: reset static link property after parsing sta...Xia Wang2011-04-133-57/+26
| | | |\ \
| | | | * | Fix access point parsing: reset static link property after parsingXia Wang2011-04-083-57/+26
* | | | | | Merge "Fix a typo in FrameLayout JavaDoc"Steve Block2011-04-131-2/+1
|\ \ \ \ \ \
| * | | | | | Fix a typo in FrameLayout JavaDocSteve Block2011-04-131-2/+1
* | | | | | | Merge "More native code cleanup."Elliott Hughes2011-04-132-248/+177
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | More native code cleanup.Elliott Hughes2011-04-132-248/+177
* | | | | | | Merge "Use an @hide libcore API to get the FileDescriptor from a Socket."Elliott Hughes2011-04-132-73/+33
|\ \ \ \ \ \ \
| * | | | | | | Use an @hide libcore API to get the FileDescriptor from a Socket.Elliott Hughes2011-04-122-73/+33
* | | | | | | | Merge "Don't allocate a raw object then call its constructor manually..."Elliott Hughes2011-04-133-50/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't allocate a raw object then call its constructor manually...Elliott Hughes2011-04-123-50/+23
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "Add camera metering area API."Wu-cheng Li2011-04-131-20/+95
|\ \ \ \ \ \ \ \
| * | | | | | | | Add camera metering area API.Wu-cheng Li2011-04-131-20/+95
* | | | | | | | | Add APIs to remove tasks.Dianne Hackborn2011-04-1213-17/+188
* | | | | | | | | Remove useless forward declarations.Elliott Hughes2011-04-1211-69/+53
| |/ / / / / / / |/| | | | | | |
* | | | | | | | resolved conflicts for merge of 18490fb9 to masterKenny Root2011-04-1213-0/+297
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aospKenny Root2011-04-1213-0/+297
| |\ \ \ \ \ \
| | * \ \ \ \ \ am 08d9d9a4: Merge "Runtime resource overlay, iteration 1."Kenny Root2011-04-1113-0/+297
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge "Runtime resource overlay, iteration 1."Kenny Root2011-04-1113-0/+297
| | | |\ \ \ \ \ \
| | | | * | | | | | Runtime resource overlay, iteration 1.MÃ¥rten Kongstad2011-04-0113-0/+297
| * | | | | | | | | am 43be7a61: EthernetDataTracker: implement setDependencyMetBenoit Goby2011-04-111-0/+4
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | EthernetDataTracker: implement setDependencyMetBenoit Goby2011-04-111-0/+4
| * | | | | | | | | am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTEBenoit Goby2011-04-111-0/+333
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | resolved conflicts for merge of 08c39c6a to honeycomb-LTEBenoit Goby2011-04-111-0/+333
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | Add support for USB Ethernet adaptersBenoit Goby2011-04-112-2/+335
* | | | | | | | | | Merge "More native code cleanup."Elliott Hughes2011-04-1216-150/+80
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | More native code cleanup.Elliott Hughes2011-04-1216-150/+80
* | | | | | | | | | | Merge "protect all /cache/recovery/last_* files from deletion"Doug Zongker2011-04-121-3/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | protect all /cache/recovery/last_* files from deletionDoug Zongker2011-04-121-3/+4
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge "Kill the global references in the OpenGL wrappers."Elliott Hughes2011-04-126-923/+756
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Kill the global references in the OpenGL wrappers.Elliott Hughes2011-04-116-923/+756
| |/ / / / / / / / /
* | | | | | | | | | Merge "You don't need to poke around inside FileDescriptor manually."Elliott Hughes2011-04-1114-238/+73
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | You don't need to poke around inside FileDescriptor manually.Elliott Hughes2011-04-1114-238/+73
* | | | | | | | | | | Merge "Fix in BreakIterator."Gilles Debunne2011-04-112-15/+20
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Fix in BreakIterator.Gilles Debunne2011-04-082-15/+20
* | | | | | | | | | | Merge "Import revised translations."Eric Fischer2011-04-111-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Import revised translations.Eric Fischer2011-04-111-2/+2
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | am f953d3e2: am 7f506024: am 78a9766b: Merge "Implement teardown script." int...Jason parks2011-04-113-1/+92
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbreadJason parks2011-04-113-1/+92
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | am 78a9766b: Merge "Implement teardown script." into gingerbreadJason parks2011-04-043-1/+92
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge "Implement teardown script." into gingerbreadJason parks2011-04-013-1/+92
| | | |\ \ \ \ \ \ \ \ \