| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 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 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 |
| | | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | | * | | | | | am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore ... | Daniel Xie | 2015-09-12 | 0 | -0/+0 |
| | | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | | * | | | | am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTe... | Daniel Xie | 2015-09-04 | 0 | -0/+0 |
| | | | | |\ \ \ \ | | | | | |/ / / | |||||
| | | | | | * | | | am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitk... | Daniel Xie | 2015-09-04 | 2 | -1/+8 |
| | | | | | |\ \ \ | | | | | | |/ / | |||||
| | | | | | | * | | am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev | Daniel Xie | 2015-09-04 | 2 | -1/+8 |
| | | | | | | |\ \ | |||||
| * | | | | | | \ \ | am 507bf148: am 3731a3c5: am 05b8a1b9: am 5181c773: am 4fe837f0: am d5ae4a3c:... | Neil Fuller | 2015-09-15 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| | * | | | | | | | | am 3731a3c5: am 05b8a1b9: am 5181c773: am 4fe837f0: am d5ae4a3c: am 19679b0f:... | Neil Fuller | 2015-09-15 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | | * | | | | | | | am 05b8a1b9: am 5181c773: am 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add t... | Neil Fuller | 2015-09-15 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | | * | | | | | | am 5181c773: am 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add testInterfaceP... | Neil Fuller | 2015-09-12 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ | | | | |/ / / / / | |||||
| | | | | * | | | | | am 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add testInterfaceProperties() .... | Neil Fuller | 2015-09-04 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ | | | | | |/ / / / | |||||
| | | | | | * | | | | am d5ae4a3c: am 19679b0f: Merge "Add testInterfaceProperties() . Move Ethern... | Neil Fuller | 2015-09-04 | 1 | -12/+33 |
| | | | | | |\ \ \ \ | | | | | | |/ / / | |||||
| | | | | | | * | | | am 19679b0f: Merge "Add testInterfaceProperties() . Move Ethernet verificati... | Neil Fuller | 2015-09-04 | 1 | -12/+33 |
| | | | | | | |\ \ \ | |||||
| * | | | | | | \ \ \ | am 96d0e10e: am dc98ff65: am 8970261f: am c09272ef: am 4f2c91b1: am bd08c8d8:... | Bill Yi | 2015-09-15 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | am dc98ff65: am 8970261f: am c09272ef: am 4f2c91b1: am bd08c8d8: am 6da6b0e4:... | Bill Yi | 2015-09-15 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | | * | | | | | | | | am 8970261f: am c09272ef: am 4f2c91b1: am bd08c8d8: am 6da6b0e4: Merge "Fix r... | Bill Yi | 2015-09-15 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | | * | | | | | | | am c09272ef: am 4f2c91b1: am bd08c8d8: am 6da6b0e4: Merge "Fix race condition... | Bill Yi | 2015-09-12 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | |||||
| | | | | * | | | | | | am 4f2c91b1: am bd08c8d8: am 6da6b0e4: Merge "Fix race condition in WeakHashM... | Bill Yi | 2015-09-04 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ | | | | | |/ / / / / | |||||
| | | | | | * | | | | | am bd08c8d8: am 6da6b0e4: Merge "Fix race condition in WeakHashMapTest." into... | Bill Yi | 2015-09-04 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ | | | | | | |/ / / / | |||||
| | | | | | | * | | | | am 6da6b0e4: Merge "Fix race condition in WeakHashMapTest." into jb-dev autom... | Bill Yi | 2015-09-04 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ | |||||
| * | | | | | | \ \ \ \ | am 2c3be718: am 61d1c8f6: am f86ad679: am 2d459b82: am 660504ac: Merge "Fixes... | Neil Fuller | 2015-09-01 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | am 61d1c8f6: am f86ad679: am 2d459b82: am 660504ac: Merge "Fixes and improvem... | Neil Fuller | 2015-09-01 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | am f86ad679: am 2d459b82: am 660504ac: Merge "Fixes and improvements for Seri... | Neil Fuller | 2015-09-01 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | | * | | | | | | | | am 2d459b82: am 660504ac: Merge "Fixes and improvements for SerializationTest... | Neil Fuller | 2015-09-01 | 1 | -37/+67 |
| | | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | |||||
| | | | | * | | | | | | | am 660504ac: Merge "Fixes and improvements for SerializationTest" into lollip... | Neil Fuller | 2015-09-01 | 1 | -37/+67 |
| | | | | |\ \ \ \ \ \ \ | |||||
| * | | | | \ \ \ \ \ \ \ | am 2cb494ee: am c510037b: am ecdd89b8: am b472314a: am 34d183b4: Merge "Rever... | Neil Fuller | 2015-09-01 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | am c510037b: am ecdd89b8: am b472314a: am 34d183b4: Merge "Revert "Changes as... | Neil Fuller | 2015-09-01 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | | * | | | | | | | | | | am ecdd89b8: am b472314a: am 34d183b4: Merge "Revert "Changes associated with... | Neil Fuller | 2015-09-01 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | | * | | | | | | | | | am b472314a: am 34d183b4: Merge "Revert "Changes associated with an OkHttp ba... | Neil Fuller | 2015-09-01 | 1 | -8/+18 |
| | | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | |||||
| | | | | * | | | | | | | | am 34d183b4: Merge "Revert "Changes associated with an OkHttp bad proxy respo... | Neil Fuller | 2015-09-01 | 1 | -8/+18 |
| | | | | |\ \ \ \ \ \ \ \ | |||||
| * | | | | \ \ \ \ \ \ \ \ | am ccd58650: am 3078014c: am 2b4d636e: am 25720de0: am 23fe202d: Merge "Fixes... | Daniel Xie | 2015-09-01 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
 |
index : libcore.git | |
| libcore | git repository hosting |
| summaryrefslogtreecommitdiffstats |