| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint" | Narayan Kamath | 2014-04-30 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge "Cast CallVoidMethod's size_t parameters to jint" | Narayan Kamath | 2014-04-30 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Cast CallVoidMethod's size_t parameters to jint | Ashok Bhat | 2014-03-06 | 1 | -1/+1 |
| * | | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD | Bill Yi | 2014-04-29 | 9 | -72/+131 |
| |\ \ \ | |/ / |/| | | |||||
| | * | | am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." | Glenn Kasten | 2014-03-19 | 1 | -1/+0 |
| | |\ \ | |||||
| | * \ \ | am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in Media... | Lajos Molnar | 2014-03-19 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | MediaPlayer: fix int overflow issue in MediaTimeProvider | Lajos Molnar | 2014-03-19 | 1 | -1/+1 |
| | * | | | | am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev | Marco Nelissen | 2014-03-14 | 2 | -0/+46 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge "Verify certificates" into klp-dev | Marco Nelissen | 2014-03-14 | 2 | -0/+46 |
| | | |\ \ \ | |||||
| | | | * | | | Verify certificates | Marco Nelissen | 2014-03-13 | 2 | -0/+46 |
| | * | | | | | am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passe... | Zhihai Xu | 2014-03-14 | 1 | -1/+1 |
| | |\ \ \ \ \ | | |/ / / / | |||||
| | | * | | | | DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from Audio... | Zhihai Xu | 2014-03-12 | 1 | -1/+1 |
| | | * | | | | Fix a JNI local reference leak in JNIMediaPlayerListener::notify. | Elliott Hughes | 2014-03-07 | 1 | -0/+1 |
| | * | | | | | am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit" | Narayan Kamath | 2014-03-11 | 1 | -3/+3 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store u... | Narayan Kamath | 2014-03-11 | 1 | -3/+3 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libj... | Marco Nelissen | 2014-03-08 | 2 | -34/+46 |
| | |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| | | * | | | | | | Make MtpDatabase use libexif instead of libjhead | Marco Nelissen | 2014-03-07 | 2 | -34/+46 |
| | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | | am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into ... | Marco Nelissen | 2014-03-07 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | ExifInterface: fix class load failure | Zhijun He | 2014-03-06 | 1 | -1/+1 |
| | * | | | | | | am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev | Marco Nelissen | 2014-03-07 | 1 | -2/+2 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | libexif is now libjhead | Marco Nelissen | 2014-03-06 | 1 | -2/+2 |
| | * | | | | | | Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into kl... | Leon Scroggins III | 2014-03-07 | 1 | -2/+2 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp | Leon Scroggins III | 2014-03-06 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | | * | | | | | Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev | Leon Scroggins III | 2014-03-06 | 1 | -2/+2 |
| | | | |\ \ \ \ \ | |||||
| | | | | * | | | | | Update framework to use M33 Skia. DO NOT MERGE | Leon Scroggins III | 2014-03-06 | 1 | -2/+2 |
| | * | | | | | | | | am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" | Narayan Kamath | 2014-03-07 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | | am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acqui... | Zhijun He | 2014-03-07 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" i... | Eric Laurent | 2014-03-06 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| | | * | | | | | | | Fix RemoteController synchronization mode | Jean-Michel Trivi | 2014-03-06 | 1 | -1/+1 |
| | | | |_|/ / / / | | |/| | | | | | |||||
| | * | | | | | | | am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compat... | Narayan Kamath | 2014-01-28 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | am bc0468e6: am 6f17adba: Merge "AArch64: Use long for pointers in media clas... | Narayan Kamath | 2014-01-16 | 24 | -153/+157 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig" | Marco Nelissen | 2014-01-14 | 1 | -8/+11 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm" | Jason Sams | 2014-01-10 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes" | Narayan Kamath | 2014-01-07 | 6 | -27/+28 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEdito... | Narayan Kamath | 2014-01-07 | 3 | -37/+37 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effe... | Narayan Kamath | 2014-01-07 | 4 | -57/+65 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputSt... | Narayan Kamath | 2014-01-07 | 2 | -20/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int." | Narayan Kamath | 2013-12-19 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am be8fbb8f: Merge "Remove unused field from MediaMuxer" | Narayan Kamath | 2013-12-18 | 2 | -9/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" | Elliott Hughes | 2013-12-16 | 4 | -29/+29 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 37c69fdd: Merge "Use java.util.Objects instead on internal API" | Kenny Root | 2013-12-13 | 2 | -8/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 263c4310: am ce468a35: Stop wifi display discovery when no longer needed. | Jeff Brown | 2013-11-21 | 1 | -27/+34 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | Stop wifi display discovery when no longer needed. | Jeff Brown | 2013-11-21 | 1 | -27/+34 |
| | * | | | | | | | | | | | | | | | | | | | am 6b0653ff: am bfdecccc: Merge "Only scan for wifi display when there is no ... | Chong Zhang | 2013-11-20 | 1 | -6/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | | | | | Only scan for wifi display when there is no active connections | Chong Zhang | 2013-11-19 | 1 | -6/+0 |
| * | | | | | | | | | | | | | | | | | | | | Track libcore.os' move to android.system. | Elliott Hughes | 2014-04-28 | 1 | -4/+3 |
| * | | | | | | | | | | | | | | | | | | | | Merge "Release DrmManagerClient resources" | Marco Nelissen | 2014-04-25 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | Release DrmManagerClient resources | Mattias Nilsson | 2014-04-15 | 1 | -0/+13 |
| * | | | | | | | | | | | | | | | | | | | | | frameworks: 64 bit compile issues | Mark Salyzyn | 2014-04-16 | 2 | -10/+13 |
| * | | | | | | | | | | | | | | | | | | | | | Remove code markers | Dmitriy Ivanov | 2014-04-15 | 2 | -34/+1 |
| |/ / / / / / / / / / / / / / / / / / / / | |||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |