| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge "Add more debugging to the DigestTest" into marshmallow-cts-dev | Daniel Xie | 2015-12-03 | 2 | -12/+103 |
| |\ | |||||
| | * | Add more debugging to the DigestTest | Kenny Root | 2015-10-27 | 2 | -12/+103 |
| * | | Merge "Fix time calculation in test_SSLSession_getLastAccessedTime" into mars... | Daniel Xie | 2015-12-03 | 1 | -1/+1 |
| |\ \ | |/ |/| | |||||
| | * | Fix time calculation in test_SSLSession_getLastAccessedTime | zhulin0910 | 2015-10-30 | 1 | -1/+1 |
| |/ | |||||
| * | am 8c894eed: am 58ca9e81: am 74b5e062: am f6a672c7: am b266f2c0: am fd2df146:... | Daniel Xie | 2015-10-09 | 0 | -0/+0 |
| |\ | |||||
| | * | am 58ca9e81: am 74b5e062: am f6a672c7: am b266f2c0: am fd2df146: am 917c8e09:... | Daniel Xie | 2015-10-09 | 0 | -0/+0 |
| | |\ | |||||
| | | * | am 74b5e062: am f6a672c7: am b266f2c0: am fd2df146: am 917c8e09: am fe790a73:... | Daniel Xie | 2015-10-08 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | am f6a672c7: am b266f2c0: am fd2df146: am 917c8e09: am fe790a73: am 779c726a:... | Daniel Xie | 2015-10-08 | 0 | -0/+0 |
| | | | |\ | |||||
| | | | | * | am b266f2c0: am fd2df146: am 917c8e09: am fe790a73: am 779c726a: Merge "Fixes... | Daniel Xie | 2015-10-08 | 0 | -0/+0 |
| | | | | |\ | |||||
| | | | | | * | am fd2df146: am 917c8e09: am fe790a73: am 779c726a: Merge "Fixes associated w... | Daniel Xie | 2015-10-08 | 0 | -0/+0 |
| | | | | | |\ | |||||
| | | | | | | * | am 917c8e09: am fe790a73: am 779c726a: Merge "Fixes associated with the tzdat... | Daniel Xie | 2015-10-08 | 1 | -8/+0 |
| | | | | | | |\ | |||||
| | | | | | | | * | am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a updat... | Daniel Xie | 2015-10-08 | 1 | -8/+0 |
| | | | | | | | |\ | |||||
| | | | | | | | | * | am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitka... | Daniel Xie | 2015-10-08 | 1 | -8/+0 |
| | | | | | | | | |\ | |||||
| | | | | | | | | | * | Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev | Daniel Xie | 2015-10-08 | 1 | -8/+0 |
| | | | | | | | | | |\ | |||||
| | | | | | | | | | | * | Fixes associated with the tzdata 2015a update | Neil Fuller | 2015-10-08 | 1 | -8/+0 |
| * | | | | | | | | | | | am 3ee1e2ac: am ab44963a: am 7999eb24: am 904fb41d: am 0e5d0c76: am 9551a862:... | Daniel Xie | 2015-10-09 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | am ab44963a: am 7999eb24: am 904fb41d: am 0e5d0c76: am 9551a862: am 97a16d1a:... | Daniel Xie | 2015-10-09 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | am 7999eb24: am 904fb41d: am 0e5d0c76: am 9551a862: am 97a16d1a: am afc1b34a:... | Daniel Xie | 2015-10-08 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | | * | | | | | | | | am 904fb41d: am 0e5d0c76: am 9551a862: am 97a16d1a: am afc1b34a: am 1d1abc5b:... | Daniel Xie | 2015-10-08 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | |||||
| | | | | * | | | | | | | am 0e5d0c76: am 9551a862: am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix T... | Daniel Xie | 2015-10-08 | 1 | -36/+15 |
| | | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | |||||
| | | | | | * | | | | | | am 9551a862: am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#t... | Daniel Xie | 2015-10-08 | 1 | -36/+15 |
| | | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | |||||
| | | | | | | * | | | | | am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistori... | Daniel Xie | 2015-10-08 | 1 | -36/+15 |
| | | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | |||||
| | | | | | | | * | | | | am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS ... | Daniel Xie | 2015-10-08 | 1 | -36/+15 |
| | | | | | | | |\ \ \ \ | | | | | | | | |/ / / | |||||
| | | | | | | | | * | | | am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." in... | Daniel Xie | 2015-10-08 | 1 | -36/+15 |
| | | | | | | | | |\ \ \ | | | | | | | | | |/ / | |||||
| | | | | | | | | | * | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts... | Daniel Xie | 2015-10-08 | 1 | -36/+15 |
| | | | | | | | | | |\ \ | | | | | | | | | | |/ | | | | | | | | | |/| | |||||
| | | | | | | | | | | * | Fix TimeZoneTest#testPreHistoricOffsets CTS failures. | Elliott Hughes | 2015-10-08 | 1 | -36/+15 |
| | | | | | | | | | |/ | |||||
| * | | | | | | | | | | am 73e64b14: am afe2e6ce: am 68232740: am c43d70e6: am 9073d215: am ba1b44d5:... | dxie@google.com | 2015-09-29 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | am afe2e6ce: am 68232740: am c43d70e6: am 9073d215: am ba1b44d5: resolved con... | dxie@google.com | 2015-09-29 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | | * | | | | | | | | am 68232740: am c43d70e6: am 9073d215: am ba1b44d5: resolved conflicts for a1... | dxie@google.com | 2015-09-29 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | | * | | | | | | | am c43d70e6: am 9073d215: am ba1b44d5: resolved conflicts for a18ebd19 to klp... | dxie@google.com | 2015-09-29 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | |||||
| | | | | * | | | | | | am 9073d215: am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-dev | dxie@google.com | 2015-09-29 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ | | | | | |/ / / / / | |||||
| | | | | | * | | | | | am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-dev | dxie@google.com | 2015-09-29 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ | | | | | | |/ / / / | |||||
| | | | | | | * | | | | resolved conflicts for a18ebd19 to klp-modular-dev | cd /gitc/manifest-rw/klp-modular-dev-gitc-merge repo sync export OUT_DIR=/usr/local/google/gitc/klp-modular-dev-gitc-merge/out # This should take 30 seconds to setup the full klp-modular-dev branch. # To resolve the conflict, next we need to clone the repo project: cd libcore # Create a new, unique branch. Note this will clone the project and may take a while the first time, depending on the size of the repo project. repo start manual_merge_a18ebd19 . git fetch goog a18ebd194ea82c5190f86fe62b56f0e46b1b36cd git merge a18ebd194ea82c5190f86fe62b56f0e46b1b36cd # Fix the conflict (markers are in the file); Build & Test; git add # (files you changed) git commit -m "resolved conflicts for a18ebd19 to klp-modular-dev" repo upload . # get approval, submit | 2015-09-28 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ | | | | | | | |/ / / | |||||
| | | | | | | | * | | | am 66b3ce69: am 70a463cb: Merge "Fix the ENGINE_finish/ENGINE_free mixup The ... | Daniel Xie | 2015-09-28 | 1 | -4/+5 |
| | | | | | | | |\ \ \ | | | | | | | | |/ / | |||||
| | | | | | | | | * | | am 70a463cb: Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were ca... | Daniel Xie | 2015-09-28 | 1 | -4/+5 |
| | | | | | | | | |\ \ | | | | | | | | | |/ | |||||
| | | | | | | | | | * | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ... | Daniel Xie | 2015-09-28 | 1 | -4/+5 |
| | | | | | | | | | |\ | |||||
| | | | | | | | | | | * | Fix the ENGINE_finish/ENGINE_free mixup | Takeshi Katae | 2015-09-10 | 1 | -4/+5 |
| | | | | | | | | | |/ | |||||
| * | | | | | | | | | | am 75090d49: (-s ours) am ebc4ca82: (-s ours) am c5a96cff: (-s ours) am 3a8c0... | Daniel Xie | 2015-09-15 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | am ebc4ca82: (-s ours) am c5a96cff: (-s ours) am 3a8c0d1e: (-s ours) am cd8cc... | Daniel Xie | 2015-09-15 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | | * | | | | | | | | am c5a96cff: (-s ours) am 3a8c0d1e: (-s ours) am cd8cc93f: (-s ours) am d59d0... | Daniel Xie | 2015-09-15 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | | * | | | | | | | am 3a8c0d1e: (-s ours) am cd8cc93f: (-s ours) am d59d0d7a: (-s ours) am aad95... | Daniel Xie | 2015-09-15 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | |||||
| | | | | * | | | | | | am cd8cc93f: (-s ours) am d59d0d7a: (-s ours) am aad953fa: (-s ours) am 92cec... | Daniel Xie | 2015-09-12 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ | | | | | |/ / / / / | |||||
| | | | | | * | | | | | am d59d0d7a: (-s ours) am aad953fa: (-s ours) am 92cec147: (-s ours) am 8a012... | Daniel Xie | 2015-09-04 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ | | | | | | |/ / / / | |||||
| | | | | | | * | | | | am aad953fa: (-s ours) am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "D... | Daniel Xie | 2015-09-04 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ | | | | | | | |/ / / | |||||
| | | | | | | | * | | | am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: r... | Daniel Xie | 2015-09-04 | 0 | -0/+0 |
| | | | | | | | |\ \ \ | | | | | | | | |/ / | |||||
| | | | | | | | | * | | am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to ki... | Daniel Xie | 2015-09-04 | 0 | -0/+0 |
| | | | | | | | | |\ \ | | | | | | | |/ / / | | | | | | | | | _ | |||||
| * | | | | | | | | | am 13405d75: am 55b43a5c: am 141d6fed: am 9b98f31f: am 2ab5a489: am 45101b8e:... | Daniel Xie | 2015-09-15 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| | * | | | | | | | | am 55b43a5c: am 141d6fed: am 9b98f31f: am 2ab5a489: am 45101b8e: am 9f275caa:... | Daniel Xie | 2015-09-15 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | | * | | | | | | | am 141d6fed: am 9b98f31f: am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8:... | Daniel Xie | 2015-09-15 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | | * | | | | | | am 9b98f31f: am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip ... | Daniel Xie | 2015-09-15 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ | | | | |/ / / / / | |||||
 |
index : libcore.git | |
| libcore | git repository hosting |
| summaryrefslogtreecommitdiffstats |