summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-06-06Merge "Add OWNERS in external/mockito" am: 0211c64d55 am: 07c9d5af17 am: 246a...oreo-mr1-devoreo-dr1-devChih-hung Hsieh
2017-06-06Merge "Add OWNERS in external/mockito" am: 0211c64d55 am: 07c9d5af17android-o-mr1-preview-2android-o-mr1-preview-1Chih-hung Hsieh
2017-06-06Merge "Add OWNERS in external/mockito" am: 0211c64d55Chih-hung Hsieh
2017-06-06Merge "Add OWNERS in external/mockito"Chih-hung Hsieh
2017-06-06Merge "Add OWNERS in external/mockito"android-o-preview-4android-o-iot-preview-5o-iot-preview-5Chih-hung Hsieh
2017-06-05Add OWNERS in external/mockitoChih-Hung Hsieh
2017-03-24Merge "Update .gitignore file to ignore IntelliJ IDEA files" am: 03585bc118 a...android-vts-8.0_r2android-vts-8.0_r1oreo-devPaul Duffin
2017-03-24Merge "Update .gitignore file to ignore IntelliJ IDEA files" am: 03585bc118Paul Duffin
2017-03-24Merge "Update .gitignore file to ignore IntelliJ IDEA files"android-wear-o-preview-4android-wear-o-preview-3android-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-17Merge "Remove unneeded call to all-makefiles-under" am: 8367d36ae7 am: bc5486...Paul Duffin
2017-03-17Merge "Remove unneeded call to all-makefiles-under" am: 8367d36ae7Paul 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: 55c52fc184 am: 9a76153826Paul Duffin
2017-03-17Modify the build and add necessary libraries am: ac292f9e96 am: 0bf44be962Paul Duffin
2017-03-17Upgrade to Mockito v2.7.13 am: 2637d96c20 am: 35f227d4afPaul Duffin
2017-03-17Merge changes from topic 'upgrade-mockito-2.7.13' am: 55c52fc184Paul Duffin
2017-03-17Modify the build and add necessary libraries am: ac292f9e96Paul Duffin
2017-03-17Upgrade to Mockito v2.7.13 am: 2637d96c20Paul Duffin
2017-03-17Merge changes from topic 'upgrade-mockito-2.7.13'Paul Duffin
2017-03-17Modify the build and add necessary librariesPaul Duffin
2017-03-17Upgrade to Mockito v2.7.13Paul 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-15Merge "Update script to match upstream structure" am: 34c934f7dd am: 71deb5ab06Paul Duffin
2017-03-15Merge "Update script to match upstream structure" am: 34c934f7ddPaul Duffin
2017-03-15Merge "Update script to match upstream structure"Paul Duffin
2017-03-15Reimplement compatibility classes against 2.7.13Paul Duffin
2017-03-15Merge "Update script to match upstream structure"android-n-mr2-preview-2Paul Duffin
2017-03-15Modify the build and add necessary librariesPaul Duffin
2017-03-14Upgrade to Mockito v2.7.13Paul Duffin
2017-03-14Update script to match upstream structurePaul Duffin
2017-03-10Merge "Improve Mockito 2.7.13 compatibility classes" am: 4f00a506f3 am: 518f9...Paul Duffin
2017-03-10Merge "Make Android.mk match downstream version." am: 71befce14f am: cec867297aPaul Duffin
2017-03-10Merge "Improve Mockito 2.7.13 compatibility classes" am: 4f00a506f3Paul Duffin
2017-03-10Merge "Make Android.mk match downstream version." am: 71befce14fPaul Duffin
2017-03-10Merge "Improve Mockito 2.7.13 compatibility classes"Paul Duffin
2017-03-10Merge "Make Android.mk match downstream version."Paul Duffin
2017-03-10Merge "Improve Mockito 2.7.13 compatibility classes"Paul Duffin
2017-03-10Merge "Make Android.mk match downstream version."Paul Duffin
2017-03-10Make Android.mk match downstream version.Paul Duffin
2017-03-10Improve Mockito 2.7.13 compatibility classesPaul Duffin
2017-03-09Merge changes I31dc4d3f,I884ba2cc am: 7ae8cdf00b am: 9c7e2baadbPaul Duffin
2017-03-09Merge changes I31dc4d3f,I884ba2cc am: 7ae8cdf00bPaul Duffin
2017-03-09Merge changes I31dc4d3f,I884ba2ccPaul Duffin