| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix JavaDoc | Ben Murdoch | 2014-03-17 | 1 | -1/+1 |
| * | Merge "Fix javadoc." into klp-modular-dev | Torne (Richard Coles) | 2014-03-17 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix javadoc. | Torne (Richard Coles) | 2014-03-17 | 1 | -1/+1 |
| * | | am c3281db2: (-s ours) am 65325236: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2014-03-17 | 0 | -0/+0 |
| |\ \ | |/ |/| | |||||
| | * | am 65325236: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2014-03-17 | 0 | -0/+0 |
| | |\ | |||||
| | | * | Import translations. DO NOT MERGE | Geoff Mendal | 2014-03-17 | 2 | -5/+5 |
| * | | | DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 | Leon Scroggins III | 2014-03-17 | 1 | -22/+47 |
| * | | | Update framework to use M33 Skia. DO NOT MERGE | Leon Scroggins III | 2014-03-17 | 25 | -212/+270 |
| * | | | Merge commit '54d5702c' into manualmerge | Craig Mautner | 2014-03-14 | 0 | -0/+0 |
| |\ \ \ | |/ / | |||||
| | * | | am 477897ad: Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT ... | Craig Mautner | 2014-03-14 | 2 | -21/+23 |
| | |\ \ | | |/ | |||||
| | | * | Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into ... | Craig Mautner | 2014-03-14 | 2 | -21/+23 |
| | | |\ | |||||
| | | | * | Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE. | Craig Mautner | 2014-03-14 | 2 | -21/+23 |
| * | | | | Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev | Tim Kilbourn | 2014-03-14 | 1 | -1/+3 |
| |\ \ \ \ | |||||
| | * | | | | FEATURE_LEANBACK implies that the device is a tv. | Tim Kilbourn | 2014-03-14 | 1 | -1/+3 |
| * | | | | | am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev | Marco Nelissen | 2014-03-14 | 2 | -0/+46 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | 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 4111e7e1: am 09421fab: Re-initialize error after attach | Daniel 2 Olofsson | 2014-03-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | am 09421fab: Re-initialize error after attach | Daniel 2 Olofsson | 2014-03-14 | 1 | -1/+1 |
| | |\ \ \ \ \ | | |/ / / / | |||||
| | | * | | | | Re-initialize error after attach | Daniel 2 Olofsson | 2014-03-14 | 1 | -1/+1 |
| * | | | | | | am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height | Selim Cinek | 2014-03-14 | 1 | -0/+7 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height | Selim Cinek | 2014-03-14 | 1 | -0/+7 |
| | |\ \ \ \ \ | | |/ / / / | |||||
| | | * | | | | DO NOT MERGE - Fixed crash for odd image width/height | Selim Cinek | 2014-03-14 | 1 | -0/+7 |
| * | | | | | | am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge | Craig Mautner | 2014-03-14 | 1 | -12/+16 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | am ff89d589: Merge commit \'3b9de0a4\' into manualmerge | Craig Mautner | 2014-03-14 | 1 | -12/+16 |
| | |\ \ \ \ \ | | |/ / / / | |||||
| | | * | | | | Merge commit '3b9de0a4' into manualmerge | Craig Mautner | 2014-03-13 | 1 | -12/+16 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | am 00e12e61: am 1066fc61: Resolved conflicts for merge of ad63d914 to jb-mr2-dev | Craig Mautner | 2014-03-13 | 1 | -25/+34 |
| | | | |\ \ \ \ | |||||
| | | | | * \ \ \ | am 1066fc61: Resolved conflicts for merge of ad63d914 to jb-mr2-dev | Craig Mautner | 2014-03-13 | 1 | -25/+34 |
| | | | | |\ \ \ \ | |||||
| | | | | | * \ \ \ | Resolved conflicts for merge of ad63d914 to jb-mr2-dev | Craig Mautner | 2014-03-13 | 1 | -25/+34 |
| | | | | | |\ \ \ \ | |||||
| | | | | | | * \ \ \ | am 20a4f490: am 817f5586: am 3d958f81: am 468e8e98: am 1f52437d: Show the key... | Craig Mautner | 2014-03-13 | 1 | -24/+33 |
| | | | | | | |\ \ \ \ | |||||
| | | | | | | | * \ \ \ | am 817f5586: am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unse... | Craig Mautner | 2014-03-13 | 1 | -24/+33 |
| | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | * \ \ \ | am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window o... | Craig Mautner | 2014-03-13 | 1 | -24/+33 |
| | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | * \ \ \ | am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top | Craig Mautner | 2014-03-13 | 1 | -24/+33 |
| | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | * \ \ \ | am 1f52437d: Show the keyguard if unsecure window on top | Craig Mautner | 2014-03-13 | 1 | -24/+33 |
| | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | * | | | | Show the keyguard if unsecure window on top | Craig Mautner | 2014-03-12 | 1 | -24/+33 |
| * | | | | | | | | | | | | | | | am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodMan... | Yohei Yukawa | 2014-03-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method c... | Yohei Yukawa | 2014-03-14 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | DO NOT MERGE - Preserve the order of InputMethodManager method calls | Yohei Yukawa | 2014-03-14 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher ico... | Craig Mautner | 2014-03-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev | Craig Mautner | 2014-03-14 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | Merge "Fix activities appearing behind launcher icons" into klp-dev | Craig Mautner | 2014-03-14 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | Fix activities appearing behind launcher icons | Craig Mautner | 2014-03-13 | 1 | -0/+1 |
| | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between... | Mike Lockwood | 2014-03-14 | 1 | -2/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory st... | Mike Lockwood | 2014-03-13 | 1 | -2/+25 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | Merge "UsbDeviceManager: Fix race condition between accessory start and USB c... | Mike Lockwood | 2014-03-13 | 1 | -2/+25 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | UsbDeviceManager: Fix race condition between accessory start and USB configur... | Mike Lockwood | 2014-03-10 | 1 | -2/+25 |
| * | | | | | | | | | | | | | | | Merge "Add leanback device features." into klp-modular-dev | Tim Kilbourn | 2014-03-14 | 2 | -2/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Add leanback device features. | Tim Kilbourn | 2014-03-13 | 2 | -2/+24 |
| * | | | | | | | | | | | | | | | | am 50694917: am 7e566239: Merge "docs: Updated Building your First App tutori... | Ricardo Cervera | 2014-03-14 | 10 | -39/+54 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |