aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-03-26merge in oc-release history after reset to masterandroid-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-cts-releasegitbuildkicker
2017-03-24Merge "Update .gitignore file to ignore IntelliJ IDEA files" am: 688063bf33 a...android-vts-8.0_r2android-vts-8.0_r1oreo-devPaul Duffin
2017-03-24Merge "Update .gitignore file to ignore IntelliJ IDEA files" am: 688063bf33Paul Duffin
2017-03-24Merge "Update .gitignore file to ignore IntelliJ IDEA files"android-wear-o-preview-4android-wear-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4Paul Duffin
2017-03-24Merge "Update .gitignore file to ignore IntelliJ IDEA files"Treehugger Robot
2017-03-24Update .gitignore file to ignore IntelliJ IDEA filesPaul Duffin
2017-03-22merge in oc-release history after reset to mastergitbuildkicker
2017-03-22merge in oc-release history after reset to 05ed811d09acad5fbd7da5cd8d34bb6b6d...gitbuildkicker
2017-03-21Merge "Scan for methods in extra interface hierarchy" am: ce33604360 am: 3a19...Paul Duffin
2017-03-21Merge "Scan for methods in extra interface hierarchy" am: ce33604360Paul Duffin
2017-03-21Merge "Scan for methods in extra interface hierarchy"Paul Duffin
2017-03-21Merge "Scan for methods in extra interface hierarchy"Treehugger Robot
2017-03-21Scan for methods in extra interface hierarchyPaul Duffin
2017-03-17Merge "Remove unneeded call to all-makefiles-under" am: 7c8fd7bceb am: 6d76c0...Paul Duffin
2017-03-17Merge "Remove unneeded call to all-makefiles-under" am: 7c8fd7bcebPaul Duffin
2017-03-17Merge "Remove unneeded call to all-makefiles-under"Paul Duffin
2017-03-17Merge "Remove unneeded call to all-makefiles-under"Treehugger Robot
2017-03-17Remove unneeded call to all-makefiles-underPaul Duffin
2017-03-17Remove unused mockito-updated/ directoryPaul Duffin
2017-03-17Merge changes from topic 'upgrade-mockito-2.7.13' am: 03a4347fc5 am: 3c2f2eb7a8Paul Duffin
2017-03-17Merge changes from topic 'upgrade-mockito-2.7.13' am: 03a4347fc5Paul Duffin
2017-03-17Merge changes from topic 'upgrade-mockito-2.7.13'Paul Duffin
2017-03-17Merge changes from topic 'upgrade-mockito-2.7.13'Paul Duffin
2017-03-16Merge "Break dependency between dexmaker-mockmaker-updated and dexmaker"TreeHugger Robot
2017-03-16Break dependency between dexmaker-mockmaker-updated and dexmakerPaul Duffin
2017-03-16Merge changes I254bb2aa,I99ee23d0 am: feab4dcdd7 am: 097c396cabPaul Duffin
2017-03-16Merge changes I254bb2aa,I99ee23d0 am: feab4dcdd7Paul Duffin
2017-03-16Merge changes I254bb2aa,I99ee23d0Paul Duffin
2017-03-16Merge changes I254bb2aa,I99ee23d0android-n-mr2-preview-2Paul Duffin
2017-03-16Merge "Hacks to allow mocking of package private classes" am: 4dbea06afc am: ...Paul Duffin
2017-03-16Merge "Hacks to allow mocking of package private classes" am: 4dbea06afcPaul Duffin
2017-03-16Merge "Hacks to allow mocking of package private classes"Paul Duffin
2017-03-16Merge "Hacks to allow mocking of package private classes"Paul Duffin
2017-03-16Reapply - Hacks to allow mocking of package private classesPaul Duffin
2017-03-15Merge "Make Android.mk the same as downstream to avoid conflicts" am: 7d2fa18...Paul Duffin
2017-03-15Merge "Make Android.mk the same as downstream to avoid conflicts" am: 7d2fa18cfdPaul Duffin
2017-03-15Update to version 2.2.0 and make it buildPaul Duffin
2017-03-15Merge "Make Android.mk the same as downstream to avoid conflicts"Paul Duffin
2017-03-15Added update_source.sh script to simplify updatingPaul Duffin
2017-03-15Clean up file structure to make more like upstreamPaul Duffin
2017-03-15Hacks to allow mocking of package private classesJason Monk
2017-03-15Merge "Make Android.mk the same as downstream to avoid conflicts"Paul Duffin
2017-03-15Make Android.mk the same as downstream to avoid conflictsPaul Duffin
2017-03-15Create separate mockito-updated/Android.mkPaul Duffin
2016-12-16Hacks to allow mocking of package private classesJason Monk
2016-12-08Add mockito plugin for new mockito target (2.2.9)Jason Monk
2016-08-10Merge changes from topic 'bug-30683723' am: 9cc20f50cb am: 7a2d6365f3 am: 39f...Paul Duffin
2016-08-10Merge changes from topic 'bug-30683723' am: 9cc20f50cb am: 7a2d6365f3android-o-preview-1android-n-mr2-preview-1o-previewPaul Duffin
2016-08-10Merge changes from topic 'bug-30683723' am: 9cc20f50cbPaul Duffin
2016-08-10Merge changes from topic 'bug-30683723'android-n-mr1-preview-2android-n-mr1-preview-1Paul Duffin