summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Remove functions for reflecting dalvik classes to rs types."Jason Sams2010-09-014-201/+0
|\
| * Remove functions for reflecting dalvik classes to rs types.Jason Sams2010-09-014-201/+0
* | Revert "Merge "Add the new Stagefright ANativeWindow OMX codec API.""Jamie Gennis2010-09-017-238/+4
* | Merge "Missing clean step."Dianne Hackborn2010-09-011-0/+1
|\ \
| * | Missing clean step.Dianne Hackborn2010-09-011-0/+1
* | | Merge "Add the new Stagefright ANativeWindow OMX codec API."Jamie Gennis2010-09-017-4/+238
|\ \ \
| * | | Add the new Stagefright ANativeWindow OMX codec API.Jamie Gennis2010-09-017-4/+238
* | | | Merge "Cleaning up the api"Alex Sakhartchouk2010-09-011-2/+2
|\ \ \ \
| * | | | Cleaning up the apiAlex Sakhartchouk2010-09-011-2/+2
* | | | | Merge "Clarify the behavior of ListView#setColorHint()."Daisuke Miyakawa2010-09-011-3/+8
|\ \ \ \ \
| * | | | | Clarify the behavior of ListView#setColorHint().Daisuke Miyakawa2010-09-011-3/+8
| |/ / / /
* | | | | am 47f2cf62: am 412fc7cd: Merge "Keep gtalk video chat specific code consiste...Andreas Huber2010-09-011-0/+8
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | am 412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp ...Andreas Huber2010-09-011-0/+8
| |\ \ \ \
| | * \ \ \ Merge "Keep gtalk video chat specific code consistent with rtsp changes." int...Andreas Huber2010-09-011-0/+8
| | |\ \ \ \
| | | * | | | Keep gtalk video chat specific code consistent with rtsp changes.Andreas Huber2010-09-011-0/+8
* | | | | | | am 021a822e: am de2b1615: Merge "Properly extract all raw_data_blocks from an...Andreas Huber2010-09-012-5/+74
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am de2b1615: Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 a...Andreas Huber2010-09-012-5/+74
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer."...Andreas Huber2010-09-012-5/+74
| | |\ \ \ \ \
| | | * | | | | Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.Andreas Huber2010-09-012-5/+74
* | | | | | | | am 9ce87963: (-s ours) am b1387127: Merge "Fix build (restore deleted assets)...Daniel Sandler2010-09-010-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am b1387127: Merge "Fix build (restore deleted assets)." into gingerbreadDaniel Sandler2010-09-012-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Fix build (restore deleted assets)." into gingerbreadDaniel Sandler2010-09-012-0/+0
| | |\ \ \ \ \ \
| | | * | | | | | Fix build (restore deleted assets).Daniel Sandler2010-09-012-0/+0
* | | | | | | | | am 27c6f7d4: am 1614843e: Merge "Fix invalid comment in WebSettings." into gi...Derek Sollenberger2010-09-012-4/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 1614843e: Merge "Fix invalid comment in WebSettings." into gingerbreadDerek Sollenberger2010-09-012-4/+12
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Fix invalid comment in WebSettings." into gingerbreadDerek Sollenberger2010-09-012-4/+12
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Fix invalid comment in WebSettings.Derek Sollenberger2010-09-012-4/+12
* | | | | | | | | am 036b3157: (-s ours) am 8f8fcfa3: Notifications are now light-on-dark in th...Daniel Sandler2010-09-010-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 8f8fcfa3: Notifications are now light-on-dark in the windowshade.Daniel Sandler2010-09-0112-7/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Notifications are now light-on-dark in the windowshade.Daniel Sandler2010-09-0112-7/+5
| | |/ / / / / /
* | | | | | | | Cleanup temporary incognito mode files after last tab closes.Elliott Slaughter2010-09-011-2/+19
* | | | | | | | resolved conflicts for merge of 41e99538 to masterBrian Carlstrom2010-09-013-38/+47
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 17510863: New Java-based SamplingProfilerBrian Carlstrom2010-09-013-43/+51
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | New Java-based SamplingProfilerBrian Carlstrom2010-09-013-43/+51
| | |/ / / / /
* | | | | | | Don't try to dist the stubs or comment check docs builds.Joe Onorato2010-09-011-0/+4
* | | | | | | Merge "add web setting for enabling/disabling synthetic links"Cary Clark2010-09-011-0/+8
|\ \ \ \ \ \ \
| * | | | | | | add web setting for enabling/disabling synthetic linksCary Clark2010-09-011-0/+8
* | | | | | | | Merge "Move Find on page and Select ActionModes to framework."Leon Scroggins2010-09-0116-62/+549
|\ \ \ \ \ \ \ \
| * | | | | | | | Move Find on page and Select ActionModes to framework.Leon Scroggins2010-09-0116-62/+549
* | | | | | | | | Merge "Remove setPreviewDisplay in CameraService::Client::~Client()."Wu-cheng Li2010-09-011-5/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Remove setPreviewDisplay in CameraService::Client::~Client().Wu-cheng Li2010-08-311-5/+0
* | | | | | | | | Merge "Send delete key events when pressed at beginning of field."Leon Scroggins III2010-09-011-6/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Send delete key events when pressed at beginning of field.Leon Scroggins III2010-08-271-6/+7
* | | | | | | | | | am 0171bfba: (-s ours) am 73ef5d4e: DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE...Derek Sollenberger2010-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | am 73ef5d4e: DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.Derek Sollenberger2010-09-012-3/+23
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.Derek Sollenberger2010-09-012-3/+23
* | | | | | | | | | Fix NPE when WebView is being destroyed prior to callback completion.Derek Sollenberger2010-09-011-2/+4
* | | | | | | | | | Merge "Updated the Summarizer to link to the source of the tests."Maksymilian Osowski2010-09-011-0/+23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Updated the Summarizer to link to the source of the tests.Maksymilian Osowski2010-09-011-0/+23
* | | | | | | | | | | Fixed a bug in forwarder where calling the stop method on ForwarderManager wo...Maksymilian Osowski2010-09-013-32/+47
|/ / / / / / / / / /