summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.4_r1' into cm-11.0cm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eaRicardo Cerqueira2013-11-01149-8686/+9958
|\
| * am 711ae8b4: am e8fdb9d5: Merge "Add to suggested BouncyCastle upgrade regres...Brian Carlstrom2013-06-071-0/+9
| |\
| | * am e8fdb9d5: Merge "Add to suggested BouncyCastle upgrade regression tests"Brian Carlstrom2013-06-071-0/+9
| | |\
| | | * Merge "Add to suggested BouncyCastle upgrade regression tests"Brian Carlstrom2013-06-071-0/+9
| | | |\
| | | | * Add to suggested BouncyCastle upgrade regression testsBrian Carlstrom2013-06-061-0/+9
| | | |/
| * | | am 39bddb1f: am ff9f947b: Merge changes I8c8f1572,Idc2bbd24Brian Carlstrom2013-06-031-1/+4
| |\| |
| | * | am ff9f947b: Merge changes I8c8f1572,Idc2bbd24Brian Carlstrom2013-06-033-5/+18
| | |\|
| | | * Merge changes I8c8f1572,Idc2bbd24Brian Carlstrom2013-06-043-5/+18
| | | |\
| | | | * Track changes to JSSEKenny Root2013-06-032-6/+12
| | | | * Allow CipherTest to run on RIBrian Carlstrom2013-06-033-4/+11
| | | |/
| * | | resolved conflicts for merge of a28cc596 to masterBrian Carlstrom2013-06-03147-8814/+9925
| |\| |
| | * | resolved conflicts for merge of dbfdf24c to stage-aosp-masterBrian Carlstrom2013-06-03148-8827/+9928
| | |\|
| | | * Merge "bouncycastle 1.49 upgrade"Brian Carlstrom2013-06-03146-8810/+9924
| | | |\
| | | | * bouncycastle 1.49 upgradeBrian Carlstrom2013-06-03146-8810/+9924
| | | |/
| * | | am 3ef83094: resolved conflicts for merge of 67e643cb to stage-aosp-masterWilliam Luh2013-05-300-0/+0
| |\| |
| | * | resolved conflicts for merge of 67e643cb to stage-aosp-masterWilliam Luh2013-05-305-31/+162
| | |\|
| | | * Merge "Fix PBKDF2WithHmacSHA1 to use high bits"William Luh2013-05-305-31/+162
| | | |\
| | | | * Fix PBKDF2WithHmacSHA1 to use high bitsWilliam Luh2013-05-285-31/+162
| | | |/
| * | | am c4e7b57a: Merge "Track changes to JSSE" into jb-mr2-dev-plus-aospKenny Root2013-04-300-0/+0
| |\| |
| | * | Merge "Track changes to JSSE" into jb-mr2-dev-plus-aospKenny Root2013-05-012-6/+12
| | |\ \
| | | * | Track changes to JSSEKenny Root2013-05-012-6/+12
| * | | | Merge "Track changes to JSSE"Kenny Root2013-05-012-6/+12
| |\ \ \ \
| | * | | | Track changes to JSSEKenny Root2013-04-302-6/+12
| * | | | | am bdbaf4d4: am 918e3ef8: Merge "Track change to JSSE"Kenny Root2013-04-301-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | am 918e3ef8: Merge "Track change to JSSE"Kenny Root2013-04-301-1/+1
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Merge "Track change to JSSE"Kenny Root2013-05-011-1/+1
| | | |\
| | | | * Track change to JSSEKenny Root2013-04-301-1/+1
| | | |/
| * | | am 69e2c60c: am ba6f0e89: Merge "Track change to JSSE provider"Kenny Root2013-04-303-5/+6
| |\| |
| | * | am ba6f0e89: Merge "Track change to JSSE provider"Kenny Root2013-04-293-5/+6
| | |\|
| | | * Merge "Track change to JSSE provider"Kenny Root2013-04-303-5/+6
| | | |\
| | | | * Track change to JSSE providerKenny Root2013-04-293-5/+6
| * | | | Merge "Fix PBKDF2WithHmacSHA1 to use high bits"William Luh2013-04-295-67/+198
| |\ \ \ \
| | * | | | Fix PBKDF2WithHmacSHA1 to use high bitsWilliam Luh2013-04-175-67/+198
| * | | | | am 89f64f30: am 57c3bb55: Revert of DERT61String change from 44021512997b337e...Brian Carlstrom2013-04-230-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 57c3bb55: Revert of DERT61String change from 44021512997b337e6079e46fd4230...Brian Carlstrom2013-04-230-0/+0
| | |\ \ \ \
| * | | | | | am 28f0a517: am 13a304fc: Merge "Revert of DERT61String change from 440215129...Brian Carlstrom2013-04-233-2/+33
| |\| | | | | | | |_|/ / / | |/| | | |
| | * | | | am 13a304fc: Merge "Revert of DERT61String change from 44021512997b337e6079e4...Brian Carlstrom2013-04-233-2/+33
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge "Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c...Brian Carlstrom2013-04-233-2/+33
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c20b6fBrian Carlstrom2013-04-223-2/+33
| | | |/ /
| * | | | am 7ba35979: am 7d18f46a: Merge "Make bouncycastle-nojarjar static to keep it...Brian Carlstrom2013-04-031-1/+1
| |\| | |
| | * | | am 7d18f46a: Merge "Make bouncycastle-nojarjar static to keep it off the device"Brian Carlstrom2013-04-031-1/+1
| | |\| |
| | | * | Merge "Make bouncycastle-nojarjar static to keep it off the device"Brian Carlstrom2013-04-041-1/+1
| | | |\ \
| | | | * | Make bouncycastle-nojarjar static to keep it off the deviceBrian Carlstrom2013-04-031-1/+1
| | | |/ /
| * | | | am c7d0f2f2: resolved conflicts for merge of bc044035 to jb-mr2-dev-plus-aospBrian Carlstrom2013-04-031-0/+11
| |\| | |
| | * | | resolved conflicts for merge of bc044035 to jb-mr2-dev-plus-aospBrian Carlstrom2013-04-031-0/+11
| | |\| |
| | | * | Merge "Add bouncycastle-nojarjar for building okhttp-tests"Brian Carlstrom2013-04-031-0/+15
| | | |\ \
| | | | * | Add bouncycastle-nojarjar for building okhttp-testsBrian Carlstrom2013-04-031-0/+15
| | | |/ /
| * | | | am 8c18c33a: resolved conflicts for merge of aebc7ff8 to jb-mr2-devKenny Root2013-03-192-3/+22
| |\| | |
| * | | | am 4b704541: (-s ours) am c7b3ba5e: am a5e1ef4e: am 9576bbd3: (-s ours) am 81...Jean-Baptiste Queru2013-03-110-0/+0
| |\ \ \ \
* | \ \ \ \ Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2Ricardo Cerqueira2013-07-24186-2865/+3542
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 07:10:43 +0000